From 4c5e8bb7c330be3f96403d1a0ae670d9f69c7117 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Mon, 14 Oct 2019 14:53:23 +0200 Subject: [PATCH] enable pac domain in apache sites --- .../de/hsadmin/mods/pac/PacProcessorFactory.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java index 06aea19..e33a2fb 100644 --- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java @@ -53,6 +53,7 @@ public class PacProcessorFactory implements EntityProcessorFactory { createIfUp(pac), createHttpdVirtualProc(hive), createSaltCallProc(), + createLinkSiteProc(pac.getName() + ".hostsharing.net"), createAccountingRulesProc())); final Config config = Config.getInstance(); for (String queueName : config.getProperty("queues.dns").split(",")) { @@ -77,6 +78,7 @@ public class PacProcessorFactory implements EntityProcessorFactory { createProftpdConfProc(hive), createHttpdVirtualProc(hive), createSaltCallProc(), + createUnlinkSiteProc(pac.getName() + ".hostsharing.net"), createSetQuotaProc(pac) )); final Config config = Config.getInstance(); @@ -156,7 +158,18 @@ public class PacProcessorFactory implements EntityProcessorFactory { } private Processor createSaltCallProc() { - return new ShellProcessor("salt-call state.sls pacs && invoke-rc.d apache2 reload >/dev/null 2>&1"); + return new ShellProcessor("salt-call state.sls pacs >/dev/null 2>&1"); + } + + 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"); + } + + 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"); } private Processor createZonefileProc(final EntityManager em, final Pac pac) {