hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Browse Source
This commit is contained in:
Purodha Blissenbach 2012-09-20 17:10:41 +02:00
commit e7fe65460a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hsarback/database/schema.sql
View File

@ -912,16 +912,17 @@ CREATE TABLE domain_option (
); );
ALTER TABLE ONLY domain_option ALTER TABLE ONLY domain_option
ADD CONSTRAINT domain_option_uniq UNIQUE (domain_option_id); ADD CONSTRAINT pk_domain_option PRIMARY KEY (domain_option_id);
CREATE UNIQUE INDEX ON domain_option ( domain_option_name ); CREATE UNIQUE INDEX domain_option_name_idx ON domain_option USING btree ( domain_option_name );
CREATE TABLE domain__domain_option ( CREATE TABLE domain__domain_option (
domain_option_id integer NOT NULL, domain_option_id integer NOT NULL,
domain_id integer NOT NULL domain_id integer NOT NULL
); );
CREATE UNIQUE INDEX unique_domain__domain_option ON domain__domain_option USING btree (domain_option_id, domain_id); ALTER TABLE ONLY domain__domain_option
ADD CONSTRAINT pk_domain__domain_option PRIMARY KEY (domain_option_id, domain_id);
ALTER TABLE ONLY domain__domain_option ALTER TABLE ONLY domain__domain_option
ADD CONSTRAINT domain_option_id_fkey FOREIGN KEY (domain_option_id) ADD CONSTRAINT domain_option_id_fkey FOREIGN KEY (domain_option_id)

6
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -249,13 +249,13 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
"chmod g+rx " + homeDir + " && " + "chmod g+rx " + homeDir + " && " +
"mkdir --mode=1550 --parents " + domsDir + " && " + "mkdir --mode=1550 --parents " + domsDir + " && " +
"chown httpd:" + pacName + " " + domsDir + " && " + "chown httpd:" + pacName + " " + domsDir + " && " +
"mkdir --mode=750 " + domainDir + " && " + "mkdir --mode=750 --parents " + domainDir + " && " +
"chown " + userName + ":httpd " + domainDir "chown " + userName + ":httpd " + domainDir
); );
CompoundProcessor domDirsProcessor = new CompoundProcessor(mkDomainDirProzessor); CompoundProcessor domDirsProcessor = new CompoundProcessor(mkDomainDirProzessor);
for (String subDir : subDirs) { for (String subDir : subDirs) {
domDirsProcessor.appendProcessor(new ShellProcessor( domDirsProcessor.appendProcessor(new ShellProcessor(
"mkdir --mode=755 " + domainDir + "/" + subDir + " && " + "mkdir --mode=755 --parents " + domainDir + "/" + subDir + " && " +
"chown " + userName + ":" + pacName + " " + domainDir + "/" + subDir "chown " + userName + ":" + pacName + " " + domainDir + "/" + subDir
)); ));
} }
@ -288,7 +288,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
); );
} }
domDirsProcessor.appendProcessor( domDirsProcessor.appendProcessor(
new ShellProcessor("ln -s " + domainDir + " /home/doms/ && " + new ShellProcessor("ln -sf " + domainDir + " /home/doms/ && " +
"chown --no-dereference " + userName + ":httpd /home/doms/" + domName "chown --no-dereference " + userName + ":httpd /home/doms/" + domName
+ " && " + "chown " + userName + ":httpd /home/doms/" + domName + "/") + " && " + "chown " + userName + ":httpd /home/doms/" + domName + "/")
); );