From 655ff977ad25ef84bd037e294296c52043835415 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 18 Nov 2016 18:33:08 +0000 Subject: [PATCH] Web logs off by default --- src/freedombone-app-dokuwiki | 4 ++-- src/freedombone-app-ghost | 4 ++-- src/freedombone-app-gogs | 4 ++-- src/freedombone-app-htmly | 4 ++-- src/freedombone-app-hubzilla | 4 ++-- src/freedombone-app-jitsi | 4 ++-- src/freedombone-app-lychee | 4 ++-- src/freedombone-utils-web | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki index 13f1148a..d1f2f3a6 100755 --- a/src/freedombone-app-dokuwiki +++ b/src/freedombone-app-dokuwiki @@ -312,7 +312,7 @@ function install_dokuwiki { echo " root /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo " server_name $DOKUWIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo " error_log /var/log/nginx/${DOKUWIKI_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME @@ -393,7 +393,7 @@ function install_dokuwiki { echo " root /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo " server_name $DOKUWIKI_ONION_HOSTNAME;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo " error_log /var/log/nginx/${DOKUWIKI_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost index 43f82145..43a7b118 100755 --- a/src/freedombone-app-ghost +++ b/src/freedombone-app-ghost @@ -387,7 +387,7 @@ function install_ghost { echo " root /var/www/${GHOST_DOMAIN_NAME}/htdocs;" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} echo " server_name ${GHOST_DOMAIN_NAME};" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} - echo " error_log /var/log/nginx/${GHOST_DOMAIN_NAME}_error.log ${WEBSERVER_LOG_LEVEL};" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} + echo " error_log /dev/null;" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} function_check nginx_ssl nginx_ssl ${GHOST_DOMAIN_NAME} @@ -423,7 +423,7 @@ function install_ghost { echo " root /var/www/$GHOST_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} echo " server_name $GHOST_ONION_HOSTNAME;" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} - echo " error_log /var/log/nginx/${GHOST_DOMAIN_NAME}_error.log ${WEBSERVER_LOG_LEVEL};" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} + echo " error_log /dev/null;" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME} function_check nginx_disable_sniffing nginx_disable_sniffing ${GHOST_DOMAIN_NAME} diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index 0a50676f..73587bca 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -489,7 +489,7 @@ function install_gogs { echo " root /var/www/${GIT_DOMAIN_NAME}/htdocs;" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} echo " server_name ${GIT_DOMAIN_NAME};" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} - echo " error_log /var/log/nginx/${GIT_DOMAIN_NAME}_error.log ${WEBSERVER_LOG_LEVEL};" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} + echo " error_log /dev/null;" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} function_check nginx_ssl nginx_ssl ${GIT_DOMAIN_NAME} @@ -525,7 +525,7 @@ function install_gogs { echo " root /var/www/$GIT_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} echo " server_name $GIT_DOMAIN_NAME;" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} - echo " error_log /var/log/nginx/${GIT_DOMAIN_NAME}_error.log ${WEBSERVER_LOG_LEVEL};" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} + echo " error_log /dev/null;" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME} function_check nginx_disable_sniffing nginx_disable_sniffing ${GIT_DOMAIN_NAME} diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly index a3ec1cd9..3f62547f 100755 --- a/src/freedombone-app-htmly +++ b/src/freedombone-app-htmly @@ -437,7 +437,7 @@ function install_htmly_website { echo " root /var/www/$HTMLY_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo " server_name $HTMLY_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo " error_log /var/log/nginx/${HTMLY_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME @@ -516,7 +516,7 @@ function install_htmly_website_onion { echo " root /var/www/$HTMLY_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo " server_name $HTMLY_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo " error_log /var/log/nginx/${HTMLY_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index fe7562c2..7d16c0d3 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -392,7 +392,7 @@ function install_hubzilla { echo ' listen [::]:443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo " root $HUBZILLA_PATH;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo " server_name $HUBZILLA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo " error_log /var/log/nginx/${HUBZILLA_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME @@ -464,7 +464,7 @@ function install_hubzilla { echo " listen 127.0.0.1:${HUBZILLA_ONION_PORT} default_server;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo " root $HUBZILLA_PATH;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo " server_name $HUBZILLA_ONION_HOSTNAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo " error_log /var/log/nginx/${HUBZILLA_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME diff --git a/src/freedombone-app-jitsi b/src/freedombone-app-jitsi index 847705bf..90853d68 100755 --- a/src/freedombone-app-jitsi +++ b/src/freedombone-app-jitsi @@ -322,7 +322,7 @@ function install_jitsi { echo '' >> $jitsi_nginx_site echo ' # Logs' >> $jitsi_nginx_site echo ' access_log /dev/null;' >> $jitsi_nginx_site - echo ' error_log /var/log/nginx/jitsi_error.log warn;' >> $jitsi_nginx_site + echo ' error_log /dev/null;' >> $jitsi_nginx_site echo '' >> $jitsi_nginx_site echo ' # BOSH' >> $jitsi_nginx_site echo ' location /http-bind {' >> $jitsi_nginx_site @@ -363,7 +363,7 @@ function install_jitsi { echo '' >> $jitsi_nginx_site echo ' # Logs' >> $jitsi_nginx_site echo ' access_log /dev/null;' >> $jitsi_nginx_site - echo ' error_log /var/log/nginx/jitsi_error.log warn;' >> $jitsi_nginx_site + echo ' error_log /dev/null;' >> $jitsi_nginx_site echo '' >> $jitsi_nginx_site echo ' # BOSH' >> $jitsi_nginx_site echo ' location /http-bind {' >> $jitsi_nginx_site diff --git a/src/freedombone-app-lychee b/src/freedombone-app-lychee index d39af096..46895763 100755 --- a/src/freedombone-app-lychee +++ b/src/freedombone-app-lychee @@ -243,7 +243,7 @@ function install_lychee_website { echo " root /var/www/$LYCHEE_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo " server_name $LYCHEE_DOMAIN_NAME;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo " error_log /var/log/nginx/${LYCHEE_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME @@ -307,7 +307,7 @@ function install_lychee_website_onion { echo " root /var/www/$LYCHEE_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo " server_name $LYCHEE_ONION_HOSTNAME;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' access_log /dev/null;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo " error_log /var/log/nginx/${LYCHEE_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo " error_log /dev/null;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' charset utf-8;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index a5f49a46..80cd316f 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -105,7 +105,7 @@ function nginx_http_redirect { echo " server_name ${domain_name};" >> $filename echo " root /var/www/${domain_name}/htdocs;" >> $filename echo ' access_log /dev/null;' >> $filename - echo " error_log /var/log/nginx/${domain_name}_error.log $WEBSERVER_LOG_LEVEL;" >> $filename + echo " error_log /dev/null;" >> $filename function_check nginx_limits nginx_limits $domain_name echo ' rewrite ^ https://$server_name$request_uri? permanent;' >> $filename @@ -592,8 +592,8 @@ function install_web_server { echo ' # Logging Settings' >> /etc/nginx/nginx.conf echo ' ##' >> /etc/nginx/nginx.conf echo '' >> /etc/nginx/nginx.conf - echo ' access_log /var/log/nginx/access.log;' >> /etc/nginx/nginx.conf - echo ' error_log /var/log/nginx/error.log;' >> /etc/nginx/nginx.conf + echo ' access_log /dev/null;' >> /etc/nginx/nginx.conf + echo ' error_log /dev/null;' >> /etc/nginx/nginx.conf echo '' >> /etc/nginx/nginx.conf echo ' ###' >> /etc/nginx/nginx.conf echo ' # Gzip Settings' >> /etc/nginx/nginx.conf