added NGINX_ENABLED parameter to disable the Nginx server

Closes #148

Author: Sameer Naik

Changelog.md

@@ -12,6 +12,7 @@
 - expose `REDMINE_SECRET_TOKEN` parameter
 - expose `REDMINE_SUDO_MODE_ENABLED` and `REDMINE_SUDO_MODE_TIMEOUT` parameters
 - expose `REDMINE_CONCURRENT_UPLOADS` parameter
+- added `NGINX_ENABLED` parameter to disable the Nginx server
 
 **3.2.0**
 - redmine: upgrade to v.3.2.0

README.md

@@ -577,6 +577,7 @@ Below is the complete list of parameters that can be set using environment varia
 - **DB_USER**: The database user. Defaults to `root`
 - **DB_PASS**: The database password. Defaults to no password
 - **DB_POOL**: The database connection pool count. Defaults to `5`.
+- **NGINX_ENABLED**: Enable/disable the nginx server. Disabling Nginx is not recommended (see #148), use at your discretion. Defaults to `true`. When disabled publish port `8080` instead of the usual port `80` or `443`.
 - **NGINX_WORKERS**: The number of nginx workers to start. Defaults to `1`.
 - **NGINX_MAX_UPLOAD_SIZE**: Maximum acceptable upload size. Defaults to `20m`.
 - **NGINX_X_FORWARDED_PROTO**: Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the redmine nginx vHost configuration. Defaults to `https` when `REDMINE_HTTPS` is `true`, else defaults to `$scheme`.

assets/build/install.sh

@@ -147,7 +147,7 @@ priority=20
 directory=/tmp
 command=/usr/sbin/nginx -g "daemon off;"
 user=root
-autostart=true
+autostart={{NGINX_ENABLED}}
 autorestart=true
 stdout_logfile=${REDMINE_LOG_DIR}/supervisor/%(program_name)s.log
 stderr_logfile=${REDMINE_LOG_DIR}/supervisor/%(program_name)s.log

assets/runtime/env-defaults

@@ -98,6 +98,7 @@ INCOMING_EMAIL_PRIVATE=${INCOMING_EMAIL_PRIVATE:-}
 INCOMING_EMAIL_ALLOW_OVERRIDE=${INCOMING_EMAIL_ALLOW_OVERRIDE:-}
 
 ## NGINX
+NGINX_ENABLED=${NGINX_ENABLED:-true}
 NGINX_WORKERS=${NGINX_WORKERS:-1}
 NGINX_MAX_UPLOAD_SIZE=${NGINX_MAX_UPLOAD_SIZE:-20m}
 

assets/runtime/functions

@@ -220,6 +220,11 @@ redmine_configure_unicorn() {
     exec_as_redmine sed -i '/{{REDMINE_RELATIVE_URL_ROOT}}/d' ${REDMINE_UNICORN_CONFIG}
   fi
 
+  if [[ ${NGINX_ENABLED} != true ]]; then
+    # nginx has been disabled, configure unicorn to listen on all interfaces
+    exec_as_redmine sed -i "s|127.0.0.1:8080|0.0.0.0:8080|" ${REDMINE_UNICORN_CONFIG}
+  fi
+
   update_template ${REDMINE_UNICORN_CONFIG} \
     REDMINE_INSTALL_DIR \
     REDMINE_USER \
@@ -582,9 +587,14 @@ configure_redmine() {
 }
 
 configure_nginx() {
-  echo "Configuring nginx..."
-  sed -i "s|worker_processes .*|worker_processes ${NGINX_WORKERS};|" /etc/nginx/nginx.conf
-  nginx_configure_redmine
+  if [[ ${NGINX_ENABLED} == true ]]; then
+    echo "Configuring nginx..."
+    sed -i "s|worker_processes .*|worker_processes ${NGINX_WORKERS};|" /etc/nginx/nginx.conf
+    nginx_configure_redmine
+  else
+    echo "Nginx has been disabled..."
+  fi
+  update_template /etc/supervisor/conf.d/nginx.conf NGINX_ENABLED
 }
 
 migrate_database() {