From 6e2db93a0fbf93c7e89cb1d6b4d0e85577516b35 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Wed, 17 Jan 2024 19:49:34 +0100 Subject: [PATCH] apache vhost: PHP: use FcgidInitialEnv and cgi-bin --- .../src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm | 4 ++-- hsarback/src/test/java/de/hsadmin/remote/DomainTest.java | 2 +- .../main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm index f5be01b..589d911 100644 --- a/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm +++ b/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm @@ -96,7 +96,7 @@ #end #if( ${fcgiphpbin} ) - SetEnv HTTP_PHP_BIN ${fcgiphpbin} + FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin} #end AddType application/x-httpd-php .php Action application/x-httpd-php /fastcgi-bin/phpstub @@ -202,7 +202,7 @@ #end #if( ${fcgiphpbin} ) - SetEnv HTTP_PHP_BIN ${fcgiphpbin} + FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin} #end AddType application/x-httpd-php .php Action application/x-httpd-php /fastcgi-bin/phpstub diff --git a/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java b/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java index ce2f8eb..82c712f 100644 --- a/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java +++ b/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java @@ -171,7 +171,7 @@ public class DomainTest { setParams.put("passengerruby", newPassengerRuby); String newPassengerNodejs = "/home/pacs/aaa00/users/admin/.nvm/versions/node/v18.19.0/bin/node"; setParams.put("passengernodejs", newPassengerNodejs); - String newFcgiPhpBin = "/usr/bin/php8.1"; + String newFcgiPhpBin = "/usr/lib/cgi-bin/php8.1"; setParams.put("fcgiphpbin", newFcgiPhpBin); String[] newDomainOptions = new String[] {"greylisting", "letsencrypt", "passenger", "passengerfriendlyerrorpages", "cgi", "fastcgi"}; diff --git a/qserv/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java b/qserv/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java index fdd5b9f..101324a 100644 --- a/qserv/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/qserv/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -270,7 +270,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory { setPathInTemplate(templateVars, "passengerpython", "/usr/bin/python3", dom.getPassengerpython()); setPathInTemplate(templateVars, "passengernodejs", "/usr/bin/node", dom.getPassengernodejs()); setPathInTemplate(templateVars, "passengerruby", "/usr/bin/ruby", dom.getPassengerruby()); - setPathInTemplate(templateVars, "fcgiphpbin", "/usr/bin/php", dom.getFcgiphpbin()); + setPathInTemplate(templateVars, "fcgiphpbin", "/usr/lib/cgi-bin/php", dom.getFcgiphpbin()); final boolean isSetLetsencryptOption = templateVars.get("letsencrypt").equals(Boolean.TRUE); final Processor domSetupProcessor = new CompoundProcessor( isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"),