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

New domain options and properties for Debian Bookworm #1

Closed
hsh-timotheuspokorra wants to merge 41 commits from TP-202311-vhost-bookworm into rel_4.0
pull from: TP-202311-vhost-bookworm
merge into: hostsharing:rel_4.0
Conversation 1 Commits 41 Files Changed 20 +9 -9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1db7a784f - Show all commits

10
qserv/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -106,7 +106,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
new VelocityProcessor("/de/hsadmin/mods/dom/named-hsh-conf.vm",
templateVars, "/etc/bind/named-hsh.conf.tmp", true),
new ShellProcessor(" ( diff -q /etc/bind/named-hsh.conf.tmp /etc/bind/named-hsh.conf && rm /etc/bind/named-hsh.conf.tmp ) " +
"|| ( mv /etc/bind/named-hsh.conf.tmp /etc/bind/named-hsh.conf && invoke-rc.d bind9 reload )")
"|| ( mv /etc/bind/named-hsh.conf.tmp /etc/bind/named-hsh.conf && systemctl reload bind9.service )")
);
}
@ -173,7 +173,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
new VelocityProcessor("/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm",
templateVars, "/etc/postgrey/whitelist_recipients.tmp", true),
new ShellProcessor(" ( diff -q /etc/postgrey/whitelist_recipients.tmp /etc/postgrey/whitelist_recipients && rm /etc/postgrey/whitelist_recipients.tmp ) " +
"|| ( mv /etc/postgrey/whitelist_recipients.tmp /etc/postgrey/whitelist_recipients && invoke-rc.d postgrey reload )")
"|| ( mv /etc/postgrey/whitelist_recipients.tmp /etc/postgrey/whitelist_recipients && systemctl restart postgrey.service )")
);
}
@ -299,7 +299,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
" || (mv /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName +
" && rm -f /etc/apache2/sites-enabled/" + linkPrefix + "-" + domName +
" && ln -sf /etc/apache2/sites-available/" + domName + " /etc/apache2/sites-enabled/" + linkPrefix + "-" + domName +
" && invoke-rc.d apache2 reload >/dev/null 2>&1)")
" && systemctl reload apache2.service >/dev/null 2>&1)")
);
return domSetupProcessor;
}
@ -340,7 +340,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
" && mkdir " + homedir + "/doms.bak" +
" && mv " + homedir + "/doms/" + domname + " " + homedir + "/doms.bak/" +
" && chown -R " + username + ":" + username + " " + homedir + "/doms.bak" +
" && invoke-rc.d apache2 reload >/dev/null 2>&1");
" && systemctl reload apache2.service >/dev/null 2>&1");
}
return
new ShellProcessor("rm -f /home/doms/" + domname +
@ -355,7 +355,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
" && chattr -i " + homedir + "/doms/" + domname + "/fastcgi/hs-phpstub" +
" && chattr -i " + homedir + "/doms/" + domname + "/fastcgi-ssl/hs-phpstub" +
" && rm -rf " + homedir + "/doms/" + domname +
" && invoke-rc.d apache2 reload >/dev/null 2>&1");
" && systemctl reload apache2.service >/dev/null 2>&1");
}
private Processor createTriggerAcmebotProcessor(final EntityManager em, final Domain dom) {

8
qserv/src/main/java/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -113,7 +113,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
return new ShellProcessor("grep -v '\"pri." + domName + "\"' /etc/bind/named.pri-zones > /etc/bind/named.pri-zones.tmp" +
" && mv /etc/bind/named.pri-zones.tmp /etc/bind/named.pri-zones" +
" && rm -f /etc/bind/pri." + domName +
" && invoke-rc.d bind9 reload");
" && systemctl reload named.service");
}
private Processor createAccountingRulesProc() {
@ -142,13 +142,13 @@ public class PacProcessorFactory implements EntityProcessorFactory {
private Processor createLinkSiteProc(final String pacDomain) {
return new ShellProcessor("ln -sf /etc/apache2/sites-available/" + pacDomain + " /etc/apache2/sites-enabled/97-" + pacDomain
+ " && invoke-rc.d apache2 reload >/dev/null 2>&1");
+ " && systemctl reload apache2.service >/dev/null 2>&1");
}
private Processor createUnlinkSiteProc(final String pacDomain) {
return new ShellProcessor("rm -f /etc/apache2/sites-enabled/97-" + pacDomain
+ " && rm -f /etc/apache2/sites-available/" + pacDomain + ""
+ " && invoke-rc.d apache2 reload >/dev/null 2>&1");
+ " && systemctl reload apache2.service >/dev/null 2>&1");
}
private Processor createZonefileProc(final EntityManager em, final Pac pac) {
@ -281,7 +281,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
new VelocityProcessor("/de/hsadmin/mods/dom/named-hsh-conf.vm",
templateVars, "/etc/bind/named-hsh.conf.tmp", true),
new ShellProcessor(" ( diff -q /etc/bind/named-hsh.conf.tmp /etc/bind/named-hsh.conf && rm /etc/bind/named-hsh.conf.tmp ) " +
"|| ( mv /etc/bind/named-hsh.conf.tmp /etc/bind/named-hsh.conf && invoke-rc.d bind9 reload )")
"|| ( mv /etc/bind/named-hsh.conf.tmp /etc/bind/named-hsh.conf && systemctl reload bind9.service )")
);
}