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

do salt-call

Browse Source
This commit is contained in:
Peter Hormanns 2019-10-04 19:42:40 +02:00
parent 8d017e93c7
commit 2d2c320454
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -52,6 +52,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
createMakePacDirectoryStructure(unixUser), createMakePacDirectoryStructure(unixUser),
createIfUp(pac), createIfUp(pac),
createHttpdVirtualProc(hive), createHttpdVirtualProc(hive),
createSaltCallProc(),
createAccountingRulesProc())); createAccountingRulesProc()));
final Config config = Config.getInstance(); final Config config = Config.getInstance();
for (String queueName : config.getProperty("queues.dns").split(",")) { for (String queueName : config.getProperty("queues.dns").split(",")) {
@ -75,6 +76,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
createNetworkInterfacesProc(hive), createNetworkInterfacesProc(hive),
createProftpdConfProc(hive), createProftpdConfProc(hive),
createHttpdVirtualProc(hive), createHttpdVirtualProc(hive),
createSaltCallProc(),
createSetQuotaProc(pac) createSetQuotaProc(pac)
)); ));
final Config config = Config.getInstance(); final Config config = Config.getInstance();
@ -153,6 +155,10 @@ public class PacProcessorFactory implements EntityProcessorFactory {
return new ShellProcessor("mk-iptables-rules Accounting"); 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) { private Processor createZonefileProc(final EntityManager em, final Pac pac) {
final Map<String, Object> zonefileTemplateVars = new HashMap<String, Object>(); final Map<String, Object> zonefileTemplateVars = new HashMap<String, Object>();
zonefileTemplateVars.put("sio", Long.toString(System.currentTimeMillis()/1000L)); zonefileTemplateVars.put("sio", Long.toString(System.currentTimeMillis()/1000L));

6
hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm
View File

@ -20,9 +20,9 @@
ServerAdmin webmaster@${pac.name}.hostsharing.net ServerAdmin webmaster@${pac.name}.hostsharing.net
SSLEngine On SSLEngine On
SSLCertificateFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.crt SSLCertificateFile /etc/apache2/pems-custom/_.hostsharing.net.crt
SSLCertificateKeyFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.key SSLCertificateKeyFile /etc/apache2/pems-custom/_.hostsharing.net.key
SSLCertificateChainFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.chain SSLCertificateChainFile /etc/apache2/pems-custom/_.hostsharing.net.chain
<Directory /> <Directory />
SSLRequireSSL On SSLRequireSSL On