HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2019-03-01 cee6ccc586ed8fbb72aa52ad779d2ddb3d085239
prepare php7.3
2 files modified
6 ■■■■ changed files
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -275,7 +275,7 @@
        ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
        ifOption(templateVars, query, "htdocsfallback", 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 Processor domSetupProcessor = new CompoundProcessor(
            isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"),
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -45,8 +45,8 @@
        Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
    </Location>
#if( ${php5} )
    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5.6
#if( ${phplatest} )
    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
#end
    RewriteEngine On