diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java index 34ee58b..06aea19 100644 --- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java @@ -52,6 +52,7 @@ public class PacProcessorFactory implements EntityProcessorFactory { createMakePacDirectoryStructure(unixUser), createIfUp(pac), createHttpdVirtualProc(hive), + createSaltCallProc(), createAccountingRulesProc())); final Config config = Config.getInstance(); for (String queueName : config.getProperty("queues.dns").split(",")) { @@ -75,6 +76,7 @@ public class PacProcessorFactory implements EntityProcessorFactory { createNetworkInterfacesProc(hive), createProftpdConfProc(hive), createHttpdVirtualProc(hive), + createSaltCallProc(), createSetQuotaProc(pac) )); final Config config = Config.getInstance(); @@ -153,6 +155,10 @@ public class PacProcessorFactory implements EntityProcessorFactory { return new ShellProcessor("mk-iptables-rules Accounting"); } + private Processor createSaltCallProc() { + return new ShellProcessor("salt-call state.sls pacs && invoke-rc.d apache2 reload >/dev/null 2>&1"); + } + private Processor createZonefileProc(final EntityManager em, final Pac pac) { final Map zonefileTemplateVars = new HashMap(); zonefileTemplateVars.put("sio", Long.toString(System.currentTimeMillis()/1000L)); diff --git a/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm b/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm index 7613365..1460a38 100644 --- a/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm +++ b/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm @@ -20,9 +20,9 @@ ServerAdmin webmaster@${pac.name}.hostsharing.net SSLEngine On - SSLCertificateFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.crt - SSLCertificateKeyFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.key - SSLCertificateChainFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.chain + SSLCertificateFile /etc/apache2/pems-custom/_.hostsharing.net.crt + SSLCertificateKeyFile /etc/apache2/pems-custom/_.hostsharing.net.key + SSLCertificateChainFile /etc/apache2/pems-custom/_.hostsharing.net.chain SSLRequireSSL On