Bob Mottram 9 years ago
parent
commit
8dc999c26c
1 changed files with 12 additions and 12 deletions
  1. 12
    12
      src/freedombone

+ 12
- 12
src/freedombone View File

1635
     sed -i "s|52 6\t|$randmin $randhr\t|g" /etc/crontab
1635
     sed -i "s|52 6\t|$randmin $randhr\t|g" /etc/crontab
1636
     sed -i "s|\t1 \* \*|\t$randdom * *|g" /etc/crontab
1636
     sed -i "s|\t1 \* \*|\t$randdom * *|g" /etc/crontab
1637
 
1637
 
1638
-    service cron restart
1638
+    systemctl restart cron
1639
 
1639
 
1640
     echo 'randomize_cron' >> $COMPLETION_FILE
1640
     echo 'randomize_cron' >> $COMPLETION_FILE
1641
 }
1641
 }
2020
     echo '        AdvRouterAddr on;' >> /etc/radvd.conf
2020
     echo '        AdvRouterAddr on;' >> /etc/radvd.conf
2021
     echo '    };' >> /etc/radvd.conf
2021
     echo '    };' >> /etc/radvd.conf
2022
     echo '};' >> /etc/radvd.conf
2022
     echo '};' >> /etc/radvd.conf
2023
-    service radvd restart
2023
+    systemctl restart radvd
2024
     if [ ! "$?" = "0" ]; then
2024
     if [ ! "$?" = "0" ]; then
2025
         systemctl status radvd.service
2025
         systemctl status radvd.service
2026
         exit 4395
2026
         exit 4395
3183
 
3183
 
3184
     if ! grep -q "/usr/bin/dynamicdns" /etc/crontab; then
3184
     if ! grep -q "/usr/bin/dynamicdns" /etc/crontab; then
3185
         echo '*/3            * *   *   *   root /usr/bin/dynamicdns' >> /etc/crontab
3185
         echo '*/3            * *   *   *   root /usr/bin/dynamicdns' >> /etc/crontab
3186
-        service cron restart
3186
+        systemctl restart cron
3187
     fi
3187
     fi
3188
 
3188
 
3189
     echo 'create_freedns_updater' >> $COMPLETION_FILE
3189
     echo 'create_freedns_updater' >> $COMPLETION_FILE
3777
     rm -f /etc/ssh/ssh_host_*
3777
     rm -f /etc/ssh/ssh_host_*
3778
     dpkg-reconfigure openssh-server
3778
     dpkg-reconfigure openssh-server
3779
     ssh_remove_small_moduli
3779
     ssh_remove_small_moduli
3780
-    service ssh restart
3780
+    systemctl restart ssh
3781
     echo 'regenerate_ssh_keys' >> $COMPLETION_FILE
3781
     echo 'regenerate_ssh_keys' >> $COMPLETION_FILE
3782
 }
3782
 }
3783
 
3783
 
3836
     apt-get -y remove ntpdate
3836
     apt-get -y remove ntpdate
3837
 
3837
 
3838
     echo '*/15           * *   *   *   root /usr/bin/updatedate' >> /etc/crontab
3838
     echo '*/15           * *   *   *   root /usr/bin/updatedate' >> /etc/crontab
3839
-    service cron restart
3839
+    systemctl restart cron
3840
 
3840
 
3841
     echo 'time_synchronisation' >> $COMPLETION_FILE
3841
     echo 'time_synchronisation' >> $COMPLETION_FILE
3842
 }
3842
 }
4691
         rm /var/lib/dovecot/ssl-parameters.dat
4691
         rm /var/lib/dovecot/ssl-parameters.dat
4692
     fi
4692
     fi
4693
 
4693
 
4694
-    service dovecot restart
4694
+    systemctl restart dovecot
4695
     echo 'configure_imap' >> $COMPLETION_FILE
4695
     echo 'configure_imap' >> $COMPLETION_FILE
4696
 }
4696
 }
4697
 
4697
 
4773
     touch /etc/ssl/ssldb
4773
     touch /etc/ssl/ssldb
4774
     echo 0001 > /etc/ssl/sslserial
4774
     echo 0001 > /etc/ssl/sslserial
4775
     #${PROJECT_NAME}-clientcert -u $MY_USERNAME
4775
     #${PROJECT_NAME}-clientcert -u $MY_USERNAME
4776
-    service dovecot restart
4776
+    systemctl restart dovecot
4777
     echo 'configure_imap_client_certs' >> $COMPLETION_FILE
4777
     echo 'configure_imap_client_certs' >> $COMPLETION_FILE
4778
 }
4778
 }
4779
 
4779
 
5122
     # obtain your public key ID
5122
     # obtain your public key ID
5123
     if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then
5123
     if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then
5124
         MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
5124
         MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
5125
-        if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then
5125
+        if [ ! "$MY_GPG_PUBLIC_KEY_ID" ]; then
5126
             return
5126
             return
5127
         fi
5127
         fi
5128
         if [ ${#MY_GPG_PUBLIC_KEY_ID} -lt 4 ]; then
5128
         if [ ${#MY_GPG_PUBLIC_KEY_ID} -lt 4 ]; then
5496
     newaliases
5496
     newaliases
5497
     update-exim4.conf.template -r
5497
     update-exim4.conf.template -r
5498
     update-exim4.conf
5498
     update-exim4.conf
5499
-    service exim4 restart
5499
+    systemctl restart exim4
5500
 
5500
 
5501
     if ! grep -q $"$PUBLIC_MAILING_LIST mailing list" /home/$MY_USERNAME/README; then
5501
     if ! grep -q $"$PUBLIC_MAILING_LIST mailing list" /home/$MY_USERNAME/README; then
5502
         echo '' >> /home/$MY_USERNAME/README
5502
         echo '' >> /home/$MY_USERNAME/README
5566
     chown -R schleuder:schleuder /var/lib/schleuder
5566
     chown -R schleuder:schleuder /var/lib/schleuder
5567
     update-exim4.conf.template -r
5567
     update-exim4.conf.template -r
5568
     update-exim4.conf
5568
     update-exim4.conf
5569
-    service exim4 restart
5569
+    systemctl restart exim4
5570
     useradd -d /var/schleuderlists -s /bin/false schleuder
5570
     useradd -d /var/schleuderlists -s /bin/false schleuder
5571
     adduser Debian-exim schleuder
5571
     adduser Debian-exim schleuder
5572
     usermod -a -G mail schleuder
5572
     usermod -a -G mail schleuder
5993
         echo "  alias $CURRENT_DDNS_DOMAIN" >> /etc/inadyn.conf
5993
         echo "  alias $CURRENT_DDNS_DOMAIN" >> /etc/inadyn.conf
5994
     fi
5994
     fi
5995
     chmod 600 /etc/inadyn.conf
5995
     chmod 600 /etc/inadyn.conf
5996
-    service inadyn restart
5996
+    systemctl restart inadyn
5997
     systemctl daemon-reload
5997
     systemctl daemon-reload
5998
 
5998
 
5999
     # clear the arguments
5999
     # clear the arguments
9677
     groupadd sipwitch
9677
     groupadd sipwitch
9678
     usermod -aG sipwitch $MY_USERNAME
9678
     usermod -aG sipwitch $MY_USERNAME
9679
 
9679
 
9680
-    service sipwitch start
9680
+    systemctl restart sipwitch
9681
 
9681
 
9682
     if ! grep -q $"SIP Server" /home/$MY_USERNAME/README; then
9682
     if ! grep -q $"SIP Server" /home/$MY_USERNAME/README; then
9683
         echo '' >> /home/$MY_USERNAME/README
9683
         echo '' >> /home/$MY_USERNAME/README