瀏覽代碼

Check that spamassassin is installed

Bob Mottram 9 年之前
父節點
當前提交
b3dcf0e172
共有 1 個檔案被更改,包括 8 行新增4 行删除
  1. 8
    4
      src/freedombone

+ 8
- 4
src/freedombone 查看文件

@@ -4455,6 +4455,10 @@ function spam_filtering {
4455 4455
     apt-get -y install exim4-daemon-heavy
4456 4456
     apt-get -y install spamassassin
4457 4457
     sa-update -v
4458
+    if [ ! -f /etc/default/spamassassin ]; then
4459
+        echo 'Spamassassin was not installed'
4460
+        exit 72570
4461
+    fi
4458 4462
     sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin
4459 4463
     sed -i 's/# spamd_address = 127.0.0.1 783/spamd_address = 127.0.0.1 783/g' /etc/exim4/exim4.conf.template
4460 4464
     # This configuration is based on https://wiki.debian.org/DebianSpamAssassin
@@ -4598,9 +4602,9 @@ function spam_filtering {
4598 4602
     # this must be accessible by root
4599 4603
     chown -R $MY_USERNAME:root /home/$MY_USERNAME/.spamassassin
4600 4604
 
4601
-    service spamassassin restart
4602
-    service exim4 restart
4603
-    service cron restart
4605
+    systemctl restart spamassassin
4606
+    systemctl restart exim4
4607
+    systemctl restart cron
4604 4608
 
4605 4609
     echo 'spam_filtering' >> $COMPLETION_FILE
4606 4610
 }
@@ -5648,7 +5652,7 @@ function install_web_server {
5648 5652
         if grep -q "Nginx-ensite commit" $COMPLETION_FILE; then
5649 5653
             CURRENT_NGINX_ENSITE_COMMIT=$(grep "Nginx-ensite commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
5650 5654
             if [[ "$CURRENT_NGINX_ENSITE_COMMIT" != "$NGINX_ENSITE_COMMIT" ]]; then
5651
-				$INSTALL_DIR/nginx_ensite
5655
+                $INSTALL_DIR/nginx_ensite
5652 5656
                 git stash
5653 5657
                 git checkout master
5654 5658
                 git pull