add defaults for no-postgres and no-rabbitmq options

This commit is contained in:
David 2018-09-16 22:13:30 +10:00
parent 9f15b2d3df
commit 6222e56ee4
1 changed files with 6 additions and 4 deletions

10
install
View File

@ -91,6 +91,8 @@ upgrade="f"
dist="" dist=""
code="" code=""
apache_bin="" apache_bin=""
skip_postgres=0
skip_rabbitmq=0
function verbose() { function verbose() {
@ -455,10 +457,10 @@ while :; do
--selinux) --selinux)
selinux="t" selinux="t"
;; ;;
--skip-postgres) --no-postgres)
skip_postgres=1 skip_postgres=1
;; ;;
--skip-rabbitmq) --no-rabbitmq)
skip_rabbitmq=1 skip_rabbitmq=1
;; ;;
--) --)
@ -998,7 +1000,7 @@ else
loudCmd "a2enmod rewrite php5" loudCmd "a2enmod rewrite php5"
fi fi
if [ $skip_postgres -ne 1 ]; then if [ $skip_postgres -eq 0 ]; then
loud "\n-----------------------------------------------------" loud "\n-----------------------------------------------------"
loud " * Configuring PostgreSQL * " loud " * Configuring PostgreSQL * "
loud "-----------------------------------------------------" loud "-----------------------------------------------------"
@ -1035,7 +1037,7 @@ EOF
fi fi
fi fi
if [ $skip_rabbitmq -ne 1 ]; then if [ $skip_rabbitmq -eq 0 ]; then
loud "\n-----------------------------------------------------" loud "\n-----------------------------------------------------"
loud " * Configuring RabbitMQ * " loud " * Configuring RabbitMQ * "