From f97d29243d5a400bfba82bd7cce3de3743446c0d Mon Sep 17 00:00:00 2001 From: Dave Page Date: Tue, 24 Mar 2020 11:36:54 +0000 Subject: [PATCH] Don't offer to configure Apache on Redhat platforms as there's nothing to do. --- pkg/linux/setup-web.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkg/linux/setup-web.sh b/pkg/linux/setup-web.sh index e2db1bebc..6443a3b29 100755 --- a/pkg/linux/setup-web.sh +++ b/pkg/linux/setup-web.sh @@ -55,20 +55,18 @@ if [ ${IS_REDHAT} == 1 ]; then restorecon -R -v /var/log/pgadmin fi -# Setup Apache -read -p "We can now configure the Apache Web server for you. This involves enabling the wsgi module and configuring the pgAdmin 4 application to mount at /pgadmin4. Do you wish to continue (y/n)? " RESPONSE -case ${RESPONSE} in - y|Y ) - if [ ${IS_REDHAT} == 1 ]; then - # TODO - true - else +# Setup Apache on Debian/Ubuntu +if [ ${IS_DEBIAN} == 1 ]; then + read -p "We can now configure the Apache Web server for you. This involves enabling the wsgi module and configuring the pgAdmin 4 application to mount at /pgadmin4. Do you wish to continue (y/n)? " RESPONSE + case ${RESPONSE} in + y|Y ) a2enmod wsgi 1> /dev/null a2enconf pgadmin4 1> /dev/null - fi;; - * ) - exit 1;; -esac + ;; + * ) + exit 1;; + esac +fi APACHE_STATUS=`ps cax | grep ${APACHE}` if [ $? -eq 0 ]; then