Bläddra i källkod

Restart after adding or removing users or changing password

Bob Mottram 8 år sedan
förälder
incheckning
8bb6aef200
1 ändrade filer med 4 tillägg och 1 borttagningar
  1. 4
    1
      src/freedombone-app-etherpad

+ 4
- 1
src/freedombone-app-etherpad Visa fil

67
             sed -i "s|\"$change_username\": {.*|\"$change_username\": { \"password\": \"$new_user_password\", \"is_admin\": false },|g" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
67
             sed -i "s|\"$change_username\": {.*|\"$change_username\": { \"password\": \"$new_user_password\", \"is_admin\": false },|g" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
68
         fi
68
         fi
69
         ${PROJECT_NAME}-pass -u $change_username -a etherpad -p "$new_user_password"
69
         ${PROJECT_NAME}-pass -u $change_username -a etherpad -p "$new_user_password"
70
+        systemctl restart etherpad
70
     fi
71
     fi
71
 }
72
 }
72
 
73
 
193
 
194
 
194
     ${PROJECT_NAME}-pass -u $remove_username --rmapp etherpad
195
     ${PROJECT_NAME}-pass -u $remove_username --rmapp etherpad
195
 
196
 
196
-    if ! grep -q "\"$remove_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
197
+    if grep -q "\"$remove_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
197
         sed -i "/\"$remove_username\": {/,/},/d" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
198
         sed -i "/\"$remove_username\": {/,/},/d" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
199
+        systemctl restart etherpad
198
     fi
200
     fi
199
 }
201
 }
200
 
202
 
205
     read_config_param ETHERPAD_DOMAIN_NAME
207
     read_config_param ETHERPAD_DOMAIN_NAME
206
     if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
208
     if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
207
         sed -i "/\"users\": {/a    \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
209
         sed -i "/\"users\": {/a    \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
210
+        systemctl restart etherpad
208
     fi
211
     fi
209
 }
212
 }
210
 
213