Bläddra i källkod

Remove old daemon commands

Bob Mottram 7 år sedan
förälder
incheckning
1163ffd146

+ 2
- 2
src/freedombone-app-sip Visa fil

146
             exit 3679
146
             exit 3679
147
         fi
147
         fi
148
         rm -rf $temp_restore_dir
148
         rm -rf $temp_restore_dir
149
-        service sipwitch restart
149
+        systemctl restart sipwitch
150
         echo $"Restore of SIP settings complete"
150
         echo $"Restore of SIP settings complete"
151
     fi
151
     fi
152
 }
152
 }
212
         return
212
         return
213
     fi
213
     fi
214
 
214
 
215
-    service sipwitch stop
215
+    systemctl stop sipwitch
216
 
216
 
217
     # remove the original sipwitch daemon if it exists
217
     # remove the original sipwitch daemon if it exists
218
     if [ -f /etc/init.d/sipwitch ]; then
218
     if [ -f /etc/init.d/sipwitch ]; then

+ 2
- 2
src/freedombone-app-xmpp Visa fil

447
             exit 725
447
             exit 725
448
         fi
448
         fi
449
         rm -rf $temp_restore_dir
449
         rm -rf $temp_restore_dir
450
-        service prosody restart
450
+        systemctl restart prosody
451
         chown -R prosody:prosody /var/lib/prosody/*
451
         chown -R prosody:prosody /var/lib/prosody/*
452
         echo $"Restore of xmpp settings complete"
452
         echo $"Restore of xmpp settings complete"
453
     fi
453
     fi
472
             exit 725
472
             exit 725
473
         fi
473
         fi
474
         rm -rf $temp_restore_dir
474
         rm -rf $temp_restore_dir
475
-        service prosody restart
475
+        systemctl restart prosody
476
         chown -R prosody:prosody /var/lib/prosody/*
476
         chown -R prosody:prosody /var/lib/prosody/*
477
         echo $"Restore of xmpp settings complete"
477
         echo $"Restore of xmpp settings complete"
478
     fi
478
     fi

+ 2
- 2
src/freedombone-backup-remote Visa fil

92
     fi
92
     fi
93
     SUSPENDED_SITE="$1"
93
     SUSPENDED_SITE="$1"
94
     nginx_dissite $SUSPENDED_SITE
94
     nginx_dissite $SUSPENDED_SITE
95
-    service nginx reload
95
+    systemctl reload nginx
96
 }
96
 }
97
 
97
 
98
 function restart_site {
98
 function restart_site {
101
         return
101
         return
102
     fi
102
     fi
103
     nginx_ensite $SUSPENDED_SITE
103
     nginx_ensite $SUSPENDED_SITE
104
-    service nginx reload
104
+    systemctl reload nginx
105
     SUSPENDED_SITE=
105
     SUSPENDED_SITE=
106
 }
106
 }
107
 
107
 

+ 13
- 20
src/freedombone-mesh Visa fil

121
     sudo cp /tmp/tox-bootstrapd.conf /etc/tox-bootstrapd.conf
121
     sudo cp /tmp/tox-bootstrapd.conf /etc/tox-bootstrapd.conf
122
     rm /tmp/tox-bootstrapd.conf
122
     rm /tmp/tox-bootstrapd.conf
123
 
123
 
124
-    if [ -f /bin/systemctl ]; then
125
-        if [ ! -f ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then
126
-            echo $"File not found ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
127
-            exit 7359
128
-        fi
129
-        sudo cp ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service /etc/systemd/system/
130
-
131
-        sudo systemctl daemon-reload
132
-        sudo systemctl enable tox-bootstrapd.service
133
-        sudo systemctl start tox-bootstrapd.service
134
-        if [ ! "$?" = "0" ]; then
135
-            sudo systemctl status tox-bootstrapd.service
136
-            exit 5846
137
-        fi
124
+    if [ ! -f ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then
125
+        echo $"File not found ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
126
+        exit 7359
127
+    fi
128
+    sudo cp ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service /etc/systemd/system/
138
 
129
 
139
-        sudo systemctl restart tox-bootstrapd.service
140
-    else
141
-        sudo cp ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.sh /etc/init.d/tox-bootstrapd
142
-        sudo chmod 755 /etc/init.d/tox-bootstrapd
143
-        sudo update-rc.d tox-bootstrapd defaults
144
-        sudo service tox-bootstrapd start
130
+    sudo systemctl daemon-reload
131
+    sudo systemctl enable tox-bootstrapd.service
132
+    sudo systemctl start tox-bootstrapd.service
133
+    if [ ! "$?" = "0" ]; then
134
+        sudo systemctl status tox-bootstrapd.service
135
+        exit 5846
145
     fi
136
     fi
146
 
137
 
138
+    sudo systemctl restart tox-bootstrapd.service
139
+
147
     TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
140
     TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
148
     if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
141
     if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
149
         echo $'Could not obtain the tox node public key'
142
         echo $'Could not obtain the tox node public key'

+ 1
- 1
src/freedombone-renew-cert Visa fil

135
         sed -i "s|$HOSTNAME.crt|$HOSTNAME.bundle.crt|g" /etc/nginx/sites-available/$HOSTNAME
135
         sed -i "s|$HOSTNAME.crt|$HOSTNAME.bundle.crt|g" /etc/nginx/sites-available/$HOSTNAME
136
 
136
 
137
         echo $'Certificate installed'
137
         echo $'Certificate installed'
138
-        service nginx restart
138
+        systemctl restart nginx
139
         return
139
         return
140
     fi
140
     fi
141
 
141
 

+ 1
- 1
src/freedombone-restore-local Visa fil

205
                 exit 962
205
                 exit 962
206
             fi
206
             fi
207
             echo $"Restarting database"
207
             echo $"Restarting database"
208
-            service mysql restart
208
+            systemctl restart mysql
209
             echo $"Change the MariaDB password to the backup version"
209
             echo $"Change the MariaDB password to the backup version"
210
             DATABASE_PASSWORD="$db_pass"
210
             DATABASE_PASSWORD="$db_pass"
211
             ${PROJECT_NAME}-pass -u root -a mariadb -p "$DATABASE_PASSWORD"
211
             ${PROJECT_NAME}-pass -u root -a mariadb -p "$DATABASE_PASSWORD"

+ 1
- 1
src/freedombone-restore-remote Visa fil

198
                 exit 962
198
                 exit 962
199
             fi
199
             fi
200
             echo $"Restarting database"
200
             echo $"Restarting database"
201
-            service mysql restart
201
+            systemctl restart mysql
202
             echo $"Change the MariaDB password to the backup version"
202
             echo $"Change the MariaDB password to the backup version"
203
             DATABASE_PASSWORD="$db_pass"
203
             DATABASE_PASSWORD="$db_pass"
204
             ${PROJECT_NAME}-pass -u root -a mariadb -p "$DATABASE_PASSWORD"
204
             ${PROJECT_NAME}-pass -u root -a mariadb -p "$DATABASE_PASSWORD"

+ 2
- 2
src/freedombone-utils-backup Visa fil

35
     # suspends a given website
35
     # suspends a given website
36
     SUSPENDED_SITE="$1"
36
     SUSPENDED_SITE="$1"
37
     nginx_dissite $SUSPENDED_SITE
37
     nginx_dissite $SUSPENDED_SITE
38
-    service nginx reload
38
+    systemctl reload nginx
39
 }
39
 }
40
 
40
 
41
 function restart_site {
41
 function restart_site {
44
         return
44
         return
45
     fi
45
     fi
46
     nginx_ensite $SUSPENDED_SITE
46
     nginx_ensite $SUSPENDED_SITE
47
-    service nginx reload
47
+    systemctl reload nginx
48
     SUSPENDED_SITE=
48
     SUSPENDED_SITE=
49
 }
49
 }
50
 
50