浏览代码

Generation of smilodon admin password

Bob Mottram 7 年前
父节点
当前提交
944ca13f2c
共有 1 个文件被更改,包括 8 次插入7 次删除
  1. 8
    7
      src/freedombone-app-smilodon

+ 8
- 7
src/freedombone-app-smilodon 查看文件

79
 }
79
 }
80
 
80
 
81
 function smilodon_create_database {
81
 function smilodon_create_database {
82
-    if [ -f $IMAGE_PASSWORD_FILE ]; then
83
-        SMILODON_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
84
-    else
85
-        if [ ! $SMILODON_ADMIN_PASSWORD ]; then
86
-            SMILODON_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
87
-        fi
88
-    fi
89
     if [ ! $SMILODON_ADMIN_PASSWORD ]; then
82
     if [ ! $SMILODON_ADMIN_PASSWORD ]; then
90
         return
83
         return
91
     fi
84
     fi
297
         SMILODON_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)$(create_password 30)"
290
         SMILODON_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)$(create_password 30)"
298
     fi
291
     fi
299
 
292
 
293
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
294
+        SMILODON_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
295
+    else
296
+        if [ ! $SMILODON_ADMIN_PASSWORD ]; then
297
+            SMILODON_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
298
+        fi
299
+    fi
300
+
300
     export smilodon_domain_name=$SMILODON_ONION_HOSTNAME
301
     export smilodon_domain_name=$SMILODON_ONION_HOSTNAME
301
     export secret_key="$SMILODON_SECRET_KEY"
302
     export secret_key="$SMILODON_SECRET_KEY"
302
     export mongodb_username='smilodon'
303
     export mongodb_username='smilodon'