瀏覽代碼

Set database password on etherpad restore

Bob Mottram 8 年之前
父節點
當前提交
309479ee1c
共有 2 個檔案被更改,包括 11 行新增2 行删除
  1. 0
    1
      src/freedombone-app-dokuwiki
  2. 11
    1
      src/freedombone-app-etherpad

+ 0
- 1
src/freedombone-app-dokuwiki 查看文件

556
 
556
 
557
     systemctl restart php7.0-fpm
557
     systemctl restart php7.0-fpm
558
     systemctl restart nginx
558
     systemctl restart nginx
559
-    systemctl restart mariadb
560
 
559
 
561
     function_check add_ddns_domain
560
     function_check add_ddns_domain
562
     add_ddns_domain $DOKUWIKI_DOMAIN_NAME
561
     add_ddns_domain $DOKUWIKI_DOMAIN_NAME

+ 11
- 1
src/freedombone-app-etherpad 查看文件

13
 # License
13
 # License
14
 # =======
14
 # =======
15
 #
15
 #
16
-# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
16
+# Copyright (C) 2016-2017 Bob Mottram <bob@freedombone.net>
17
 #
17
 #
18
 # This program is free software: you can redistribute it and/or modify
18
 # This program is free software: you can redistribute it and/or modify
19
 # it under the terms of the GNU Affero General Public License as published by
19
 # it under the terms of the GNU Affero General Public License as published by
360
         if [ -f /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key ]; then
360
         if [ -f /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key ]; then
361
             chown etherpad: /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key
361
             chown etherpad: /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key
362
         fi
362
         fi
363
+
364
+        MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
365
+        settings_file=/var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
366
+        sed -i "s|\"password\":.*|\"password\": \"${MARIADB_PASSWORD}\",|g" $settings_file
367
+        MARIADB_PASSWORD=
363
     fi
368
     fi
364
 }
369
 }
365
 
370
 
405
         if [ -f /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key ]; then
410
         if [ -f /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key ]; then
406
             chown etherpad: /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key
411
             chown etherpad: /etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key
407
         fi
412
         fi
413
+
414
+        MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
415
+        settings_file=/var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
416
+        sed -i "s|\"password\":.*|\"password\": \"${MARIADB_PASSWORD}\",|g" $settings_file
417
+        MARIADB_PASSWORD=
408
     fi
418
     fi
409
 }
419
 }
410
 
420