Browse Source

Set log level

Bob Mottram 9 years ago
parent
commit
655a4184af
2 changed files with 6 additions and 5 deletions
  1. 3
    3
      src/freedombone
  2. 3
    2
      src/freedombone-logging

+ 3
- 3
src/freedombone View File

280
 export DEBIAN_FRONTEND=noninteractive
280
 export DEBIAN_FRONTEND=noninteractive
281
 
281
 
282
 # logging level for Nginx
282
 # logging level for Nginx
283
-WEBSERVER_LOG_LEVEL='crit'
283
+WEBSERVER_LOG_LEVEL='warn'
284
 
284
 
285
 # used to limit CPU usage
285
 # used to limit CPU usage
286
 CPULIMIT='/usr/bin/cpulimit -l 20 -e'
286
 CPULIMIT='/usr/bin/cpulimit -l 20 -e'
9357
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9357
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9358
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9358
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9359
   echo '    access_log off;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9359
   echo '    access_log off;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9360
-  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error.log;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9360
+  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9361
   echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9361
   echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9362
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9362
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9363
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9363
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9434
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9434
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9435
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9435
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9436
   echo '    access_log off;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9436
   echo '    access_log off;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9437
-  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error_ssl.log;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9437
+  echo "    error_log /var/log/nginx/${WIKI_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9438
   echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9438
   echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9439
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9439
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9440
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
9440
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME

+ 3
- 2
src/freedombone-logging View File

28
 # You should have received a copy of the GNU General Public License
28
 # You should have received a copy of the GNU General Public License
29
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
29
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
30
 
30
 
31
+WEBSERVER_LOG_LEVEL='warn'
32
+
31
 if [ ! "$1" ]; then
33
 if [ ! "$1" ]; then
32
     exit 1
34
     exit 1
33
 fi
35
 fi
37
       for filename in /etc/nginx/sites-available/* ; do
39
       for filename in /etc/nginx/sites-available/* ; do
38
           filename_domain=$(echo "$filename" | awk -F '/' '{print $5}')
40
           filename_domain=$(echo "$filename" | awk -F '/' '{print $5}')
39
           sed -i "s|access_log.*|access_log /var/log/nginx/$filename_domain.access.log;|g" $filename
41
           sed -i "s|access_log.*|access_log /var/log/nginx/$filename_domain.access.log;|g" $filename
40
-          sed -i "s|warn_log.*|warn_log /var/log/nginx/$filename_domain.warn.log;|g" $filename
41
-          sed -i "s|error_log.*|error_log /var/log/nginx/$filename_domain.err.log;|g" $filename
42
+          sed -i "s|error_log.*|error_log /var/log/nginx/$filename_domain.err.log $WEBSERVER_LOG_LEVEL;|g" $filename
42
       done
43
       done
43
   fi
44
   fi
44
   if [ -f /etc/init.d/spamassassin ]; then
45
   if [ -f /etc/init.d/spamassassin ]; then