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 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6e2db93a0f - Show all commits

4
hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
View File

@ -96,7 +96,7 @@
#end #end
#if( ${fcgiphpbin} ) #if( ${fcgiphpbin} )
SetEnv HTTP_PHP_BIN ${fcgiphpbin} FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin}
#end #end
AddType application/x-httpd-php .php AddType application/x-httpd-php .php
Action application/x-httpd-php /fastcgi-bin/phpstub Action application/x-httpd-php /fastcgi-bin/phpstub
@ -202,7 +202,7 @@
#end #end
#if( ${fcgiphpbin} ) #if( ${fcgiphpbin} )
SetEnv HTTP_PHP_BIN ${fcgiphpbin} FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin}
#end #end
AddType application/x-httpd-php .php AddType application/x-httpd-php .php
Action application/x-httpd-php /fastcgi-bin/phpstub Action application/x-httpd-php /fastcgi-bin/phpstub

2
hsarback/src/test/java/de/hsadmin/remote/DomainTest.java
View File

@ -171,7 +171,7 @@ public class DomainTest {
setParams.put("passengerruby", newPassengerRuby); setParams.put("passengerruby", newPassengerRuby);
String newPassengerNodejs = "/home/pacs/aaa00/users/admin/.nvm/versions/node/v18.19.0/bin/node"; String newPassengerNodejs = "/home/pacs/aaa00/users/admin/.nvm/versions/node/v18.19.0/bin/node";
setParams.put("passengernodejs", newPassengerNodejs); setParams.put("passengernodejs", newPassengerNodejs);
String newFcgiPhpBin = "/usr/bin/php8.1"; String newFcgiPhpBin = "/usr/lib/cgi-bin/php8.1";
setParams.put("fcgiphpbin", newFcgiPhpBin); setParams.put("fcgiphpbin", newFcgiPhpBin);
String[] newDomainOptions = new String[] {"greylisting", "letsencrypt", "passenger", "passengerfriendlyerrorpages", "cgi", "fastcgi"}; String[] newDomainOptions = new String[] {"greylisting", "letsencrypt", "passenger", "passengerfriendlyerrorpages", "cgi", "fastcgi"};

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

@ -270,7 +270,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
setPathInTemplate(templateVars, "passengerpython", "/usr/bin/python3", dom.getPassengerpython()); setPathInTemplate(templateVars, "passengerpython", "/usr/bin/python3", dom.getPassengerpython());
setPathInTemplate(templateVars, "passengernodejs", "/usr/bin/node", dom.getPassengernodejs()); setPathInTemplate(templateVars, "passengernodejs", "/usr/bin/node", dom.getPassengernodejs());
setPathInTemplate(templateVars, "passengerruby", "/usr/bin/ruby", dom.getPassengerruby()); 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 boolean isSetLetsencryptOption = templateVars.get("letsencrypt").equals(Boolean.TRUE);
final Processor domSetupProcessor = new CompoundProcessor( final Processor domSetupProcessor = new CompoundProcessor(
isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"), isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"),