浏览代码

Reverse logic

Bob Mottram 8 年前
父节点
当前提交
bb64427344
共有 4 个文件被更改,包括 5 次插入11 次删除
  1. 3
    1
      src/freedombone-app-gnusocial
  2. 0
    5
      src/freedombone-app-koel
  3. 0
    3
      src/freedombone-app-nextcloud
  4. 2
    2
      src/freedombone-logging

+ 3
- 1
src/freedombone-app-gnusocial 查看文件

570
     sed -i '/gnusocial/d' $COMPLETION_FILE
570
     sed -i '/gnusocial/d' $COMPLETION_FILE
571
     remove_backup_database_local gnusocial
571
     remove_backup_database_local gnusocial
572
 
572
 
573
-    sed -i '/gnusocial-firewall/d' /etc/crontab
573
+    if grep -q 'gnusocial-firewall' /etc/crontab; then
574
+        sed -i '/gnusocial-firewall/d' /etc/crontab
575
+    fi
574
 
576
 
575
     function_check remove_ddns_domain
577
     function_check remove_ddns_domain
576
     remove_ddns_domain $GNUSOCIAL_DOMAIN_NAME
578
     remove_ddns_domain $GNUSOCIAL_DOMAIN_NAME

+ 0
- 5
src/freedombone-app-koel 查看文件

466
     drop_database koel
466
     drop_database koel
467
     function_check remove_onion_service
467
     function_check remove_onion_service
468
     remove_onion_service koel ${KOEL_ONION_PORT}
468
     remove_onion_service koel ${KOEL_ONION_PORT}
469
-    if grep -q "koel" /etc/crontab; then
470
-        sed -i "/koel/d" /etc/crontab
471
-    fi
472
     remove_app koel
469
     remove_app koel
473
     remove_completion_param install_koel
470
     remove_completion_param install_koel
474
     sed -i '/koel/d' $COMPLETION_FILE
471
     sed -i '/koel/d' $COMPLETION_FILE
475
     remove_backup_database_local koel
472
     remove_backup_database_local koel
476
 
473
 
477
-    sed -i '/koel-firewall/d' /etc/crontab
478
-
479
     function_check remove_ddns_domain
474
     function_check remove_ddns_domain
480
     remove_ddns_domain $KOEL_DOMAIN_NAME
475
     remove_ddns_domain $KOEL_DOMAIN_NAME
481
 }
476
 }

+ 0
- 3
src/freedombone-app-nextcloud 查看文件

374
     drop_database nextcloud
374
     drop_database nextcloud
375
     function_check remove_onion_service
375
     function_check remove_onion_service
376
     remove_onion_service nextcloud ${NEXTCLOUD_ONION_PORT}
376
     remove_onion_service nextcloud ${NEXTCLOUD_ONION_PORT}
377
-    if grep -q "nextcloud" /etc/crontab; then
378
-        sed -i "/nextcloud/d" /etc/crontab
379
-    fi
380
     remove_app nextcloud
377
     remove_app nextcloud
381
     remove_completion_param install_nextcloud
378
     remove_completion_param install_nextcloud
382
     sed -i '/nextcloud/d' $COMPLETION_FILE
379
     sed -i '/nextcloud/d' $COMPLETION_FILE

+ 2
- 2
src/freedombone-logging 查看文件

83
 }
83
 }
84
 
84
 
85
 function turn_off_rsys_logging {
85
 function turn_off_rsys_logging {
86
-    if grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
86
+    if ! grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
87
         return
87
         return
88
     fi
88
     fi
89
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
89
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
109
 }
109
 }
110
 
110
 
111
 function turn_on_rsys_logging {
111
 function turn_on_rsys_logging {
112
-    if ! grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
112
+    if grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
113
         return
113
         return
114
     fi
114
     fi
115
     sed -i 's|mail,news.none.*|mail,news.none      -/var/log/messages|g' /etc/rsyslog.conf
115
     sed -i 's|mail,news.none.*|mail,news.none      -/var/log/messages|g' /etc/rsyslog.conf