Bob Mottram 7 лет назад
Родитель
Сommit
259e061dcf
3 измененных файлов: 11 добавлений и 0 удалений
  1. 2
    0
      src/freedombone-controlpanel
  2. 6
    0
      src/freedombone-logging
  3. 3
    0
      src/freedombone-utils-setup

+ 2
- 0
src/freedombone-controlpanel Просмотреть файл

@@ -1295,6 +1295,8 @@ function reset_tripwire {
1295 1295
         return
1296 1296
     fi
1297 1297
     clear
1298
+    echo $'Turing off logging...'
1299
+    ${PROJECT_NAME}-logging off
1298 1300
     echo $'Locking down permissions...'
1299 1301
     lockdown_permissions
1300 1302
     echo $'Creating configuration...'

+ 6
- 0
src/freedombone-logging Просмотреть файл

@@ -83,6 +83,9 @@ function turn_logging_off {
83 83
 }
84 84
 
85 85
 function turn_off_rsys_logging {
86
+    if grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
87
+        return
88
+    fi
86 89
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
87 90
     sed -i 's|auth,authpriv.\*.*|auth,authpriv.\*         /dev/null|g' /etc/rsyslog.conf
88 91
     sed -i 's|mail.info.*|mail.info            /dev/null|g' /etc/rsyslog.conf
@@ -106,6 +109,9 @@ function turn_off_rsys_logging {
106 109
 }
107 110
 
108 111
 function turn_on_rsys_logging {
112
+    if ! grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
113
+        return
114
+    fi
109 115
     sed -i 's|mail,news.none.*|mail,news.none      -/var/log/messages|g' /etc/rsyslog.conf
110 116
     sed -i 's|auth,authpriv.\*.*|auth,authpriv.\*         /var/log/auth.log|g' /etc/rsyslog.conf
111 117
     sed -i 's|mail.info.*|mail.info            -/var/log/mail.info|g' /etc/rsyslog.conf

+ 3
- 0
src/freedombone-utils-setup Просмотреть файл

@@ -208,6 +208,9 @@ function install_backports_kernel {
208 208
 }
209 209
 
210 210
 function turn_off_rsys_logging {
211
+    if grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
212
+        return
213
+    fi
211 214
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
212 215
     sed -i 's|auth,authpriv.\*.*|auth,authpriv.\*         /dev/null|g' /etc/rsyslog.conf
213 216
     sed -i 's|mail.info.*|mail.info            /dev/null|g' /etc/rsyslog.conf