From 655a4184afcdda9684c91c374634217b127c0985 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 16 Nov 2015 12:05:07 +0000
Subject: [PATCH] Set log level

---
 src/freedombone         | 6 +++---
 src/freedombone-logging | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 6c149594..c3f07c95 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -280,7 +280,7 @@ MY_NAME=$DEFAULT_DOMAIN_NAME
 export DEBIAN_FRONTEND=noninteractive
 
 # logging level for Nginx
-WEBSERVER_LOG_LEVEL='crit'
+WEBSERVER_LOG_LEVEL='warn'
 
 # used to limit CPU usage
 CPULIMIT='/usr/bin/cpulimit -l 20 -e'
@@ -9357,7 +9357,7 @@ function install_wiki {
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    access_log off;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
-  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error.log;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
+  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -9434,7 +9434,7 @@ function install_wiki {
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    access_log off;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
-  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error_ssl.log;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
+  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
diff --git a/src/freedombone-logging b/src/freedombone-logging
index c5779be4..2ae7e3e8 100755
--- a/src/freedombone-logging
+++ b/src/freedombone-logging
@@ -28,6 +28,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+WEBSERVER_LOG_LEVEL='warn'
+
 if [ ! "$1" ]; then
     exit 1
 fi
@@ -37,8 +39,7 @@ if [[ "$1" == "on" || "$1" == "On" || "$1" == "ON" ]]; then
       for filename in /etc/nginx/sites-available/* ; do
           filename_domain=$(echo "$filename" | awk -F '/' '{print $5}')
           sed -i "s|access_log.*|access_log /var/log/nginx/$filename_domain.access.log;|g" $filename
-          sed -i "s|warn_log.*|warn_log /var/log/nginx/$filename_domain.warn.log;|g" $filename
-          sed -i "s|error_log.*|error_log /var/log/nginx/$filename_domain.err.log;|g" $filename
+          sed -i "s|error_log.*|error_log /var/log/nginx/$filename_domain.err.log $WEBSERVER_LOG_LEVEL;|g" $filename
       done
   fi
   if [ -f /etc/init.d/spamassassin ]; then