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

prepare php7.3

Browse Source
This commit is contained in:
Peter Hormanns 2019-03-01 12:04:05 +01:00
parent ccc7b35b4c
commit 5822d2d038
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews"); ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE); ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE);
ifOption(templateVars, query, "letsencrypt", Boolean.TRUE, Boolean.FALSE); ifOption(templateVars, query, "letsencrypt", Boolean.TRUE, Boolean.FALSE);
ifOption(templateVars, query, "php5", Boolean.TRUE, Boolean.FALSE); ifOption(templateVars, query, "phplatest", Boolean.TRUE, Boolean.FALSE);
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"),

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

@ -45,8 +45,8 @@
Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
</Location> </Location>
#if( ${php5} ) #if( ${phplatest} )
FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5.6 FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
#end #end
RewriteEngine On RewriteEngine On