Bob Mottram 8 년 전
부모
커밋
ebd37f392c
3개의 변경된 파일17개의 추가작업 그리고 30개의 파일을 삭제
  1. 3
    15
      src/freedombone-app-irc
  2. 2
    15
      src/freedombone-app-mumble
  3. 12
    0
      src/freedombone-utils-keys

+ 3
- 15
src/freedombone-app-irc 파일 보기

227
 function change_password_irc {
227
 function change_password_irc {
228
     new_global_password="$2"
228
     new_global_password="$2"
229
 
229
 
230
-    # Change the password for all users
231
-    for d in /home/*/ ; do
232
-        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
233
-        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
234
-            ${PROJECT_NAME}-pass -u "$USERNAME" -a irc -p "$new_global_password"
235
-        fi
236
-    done
237
-
230
+    set_password_for_all_users irc "$new_global_password"
238
     irc_set_global_password_base "$new_global_password"
231
     irc_set_global_password_base "$new_global_password"
239
 }
232
 }
240
 
233
 
522
 
515
 
523
     IRC_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
516
     IRC_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
524
 
517
 
525
-    # Change the password for all users
526
-    for d in /home/*/ ; do
527
-        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
528
-        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
529
-            ${PROJECT_NAME}-pass -u "$USERNAME" -a irc -p "$IRC_PASSWORD"
530
-        fi
531
-    done
518
+    set_password_for_all_users irc "$IRC_PASSWORD"
519
+
532
 
520
 
533
     echo '**************************************************' > /etc/ngircd/motd
521
     echo '**************************************************' > /etc/ngircd/motd
534
     echo $'*           F R E E D O M B O N E   I R C        *' >> /etc/ngircd/motd
522
     echo $'*           F R E E D O M B O N E   I R C        *' >> /etc/ngircd/motd

+ 2
- 15
src/freedombone-app-mumble 파일 보기

55
 function change_password_mumble {
55
 function change_password_mumble {
56
     new_mumble_password="$2"
56
     new_mumble_password="$2"
57
 
57
 
58
-    # Change the password for all users
59
-    for d in /home/*/ ; do
60
-        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
61
-        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
62
-            ${PROJECT_NAME}-pass -u "$USERNAME" -a mumble -p "$new_mumble_password"
63
-        fi
64
-    done
65
-
58
+    set_password_for_all_users mumble "$new_mumble_password"
66
     sed -i "s|serverpassword=.*|serverpassword=$new_mumble_password|g" /etc/mumble-server.ini
59
     sed -i "s|serverpassword=.*|serverpassword=$new_mumble_password|g" /etc/mumble-server.ini
67
     systemctl restart mumble-server
60
     systemctl restart mumble-server
68
 }
61
 }
268
     update_default_domain
261
     update_default_domain
269
     systemctl restart mumble-server
262
     systemctl restart mumble-server
270
 
263
 
271
-    # Change the password for all users
272
-    for d in /home/*/ ; do
273
-        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
274
-        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
275
-            ${PROJECT_NAME}-pass -u "$USERNAME" -a mumble -p "$MUMBLE_SERVER_PASSWORD"
276
-        fi
277
-    done
264
+    set_password_for_all_users mumble "$MUMBLE_SERVER_PASSWORD"
278
 
265
 
279
     function_check configure_firewall_for_mumble
266
     function_check configure_firewall_for_mumble
280
     configure_firewall_for_mumble
267
     configure_firewall_for_mumble

+ 12
- 0
src/freedombone-utils-keys 파일 보기

242
     fi
242
     fi
243
 }
243
 }
244
 
244
 
245
+function set_password_for_all_users {
246
+    app_name="$1"
247
+    change_password="$2"
248
+
249
+    for d in /home/*/ ; do
250
+        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
251
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
252
+            ${PROJECT_NAME}-pass -u "${USERNAME}" -a "${app_name}" -p "${change_password}"
253
+        fi
254
+    done
255
+}
256
+
245
 # NOTE: deliberately there is no "exit 0"
257
 # NOTE: deliberately there is no "exit 0"