diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-11-15 16:11:31 +0100 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-11-15 16:11:31 +0100 |
| commit | 37481d8781c8f9b023ecd34c125f28c4b1e96381 (patch) | |
| tree | 2ebd3a11491d38b618cacbc04837bf00d3350c83 /installer/opengnsys_installer.sh | |
| parent | b351d8afce7769df7e57c13c88efc3b1346d031e (diff) | |
#784: Apache configuration now supports connection with PHP-FPM via socket and port.
Diffstat (limited to 'installer/opengnsys_installer.sh')
| -rwxr-xr-x | installer/opengnsys_installer.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 0da6c226..d877548b 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1169,8 +1169,14 @@ function installWebConsoleApacheConf() $WORKDIR/opengnsys/server/etc/apache-prev2.4.conf.tmpl > $path_apache2_confd/$APACHESITESDIR/${APACHEOGSITE} else # Configuración específica a partir de Apache 2.4 - sed -e "s,CONSOLEDIR,$CONSOLEDIR,g; s,SOCKFILE,$sockfile,g" \ - $WORKDIR/opengnsys/server/etc/apache.conf.tmpl > $path_apache2_confd/$APACHESITESDIR/${APACHEOGSITE}.conf + if [ -n "$sockfile" ]; then + sed -e "s,CONSOLEDIR,$CONSOLEDIR,g" \ + -e "s,proxy:fcgi:.*,proxy:unix:${sockfile%% *}|fcgi://localhost\",g" \ + $WORKDIR/opengnsys/server/etc/apache.conf.tmpl > $path_apache2_confd/$APACHESITESDIR/${APACHEOGSITE}.conf + else + sed -e "s,CONSOLEDIR,$CONSOLEDIR,g" \ + $WORKDIR/opengnsys/server/etc/apache.conf.tmpl > $path_apache2_confd/$APACHESITESDIR/${APACHEOGSITE}.conf + fi fi $APACHEENABLEOG if [ $? -ne 0 ]; then |