Bob Mottram 9 년 전
부모
커밋
fbbb8fd691
2개의 변경된 파일13개의 추가작업 그리고 13개의 파일을 삭제
  1. 12
    12
      src/freedombone
  2. 1
    1
      src/freedombone-splitkey

+ 12
- 12
src/freedombone 파일 보기

@@ -6769,7 +6769,7 @@ function install_mariadb {
6769 6769
 
6770 6770
   get_mariadb_password
6771 6771
   if [ ! $MARIADB_PASSWORD ]; then
6772
-      MARIADB_PASSWORD=$(openssl rand -base64 32)
6772
+      MARIADB_PASSWORD="$(openssl rand -base64 32)"
6773 6773
       echo "$MARIADB_PASSWORD" > $DATABASE_PASSWORD_FILE
6774 6774
       chmod 600 $DATABASE_PASSWORD_FILE
6775 6775
 
@@ -7016,7 +7016,7 @@ function install_owncloud {
7016 7016
 
7017 7017
   get_mariadb_owncloud_admin_password
7018 7018
   if [ ! $OWNCLOUD_ADMIN_PASSWORD ]; then
7019
-      OWNCLOUD_ADMIN_PASSWORD=$(openssl rand -base64 32)
7019
+      OWNCLOUD_ADMIN_PASSWORD="$(openssl rand -base64 32)"
7020 7020
   fi
7021 7021
 
7022 7022
   if ! grep -q "Owncloud database user" /home/$MY_USERNAME/README; then
@@ -7264,7 +7264,7 @@ function install_gogs {
7264 7264
 
7265 7265
   get_mariadb_git_admin_password
7266 7266
   if [ ! $GIT_ADMIN_PASSWORD ]; then
7267
-      GIT_ADMIN_PASSWORD=$(openssl rand -base64 32)
7267
+      GIT_ADMIN_PASSWORD="$(openssl rand -base64 32)"
7268 7268
   fi
7269 7269
 
7270 7270
   if ! grep -q "Gogs admin user password" /home/$MY_USERNAME/README; then
@@ -7505,7 +7505,7 @@ function install_xmpp {
7505 7505
   touch /home/$MY_USERNAME/README
7506 7506
 
7507 7507
   if ! grep -q "Your XMPP password is" /home/$MY_USERNAME/README; then
7508
-      XMPP_PASSWORD=$(openssl rand -base64 8)
7508
+      XMPP_PASSWORD="$(openssl rand -base64 8)"
7509 7509
       prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD
7510 7510
       echo '' >> /home/$MY_USERNAME/README
7511 7511
       echo '' >> /home/$MY_USERNAME/README
@@ -7575,8 +7575,8 @@ function install_irc_server {
7575 7575
   sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
7576 7576
   sed -i 's|;KeyFile = /etc/ngircd/#chan.key|KeyFile = /etc/ngircd/#freedombone.key|g' /etc/ngircd/ngircd.conf
7577 7577
   sed -i 's/;CloakHost = cloaked.host/CloakHost = freedombone/g' /etc/ngircd/ngircd.conf
7578
-  IRC_SALT=$(openssl rand -base64 32)
7579
-  IRC_OPERATOR_PASSWORD=$(openssl rand -base64 8)
7578
+  IRC_SALT="$(openssl rand -base64 32)"
7579
+  IRC_OPERATOR_PASSWORD="$(openssl rand -base64 8)"
7580 7580
   sed -i "s|;CloakHostSalt = abcdefghijklmnopqrstuvwxyz|CloakHostSalt = $IRC_SALT|g" /etc/ngircd/ngircd.conf
7581 7581
   sed -i 's/;ConnectIPv4 = yes/ConnectIPv4 = yes/g' /etc/ngircd/ngircd.conf
7582 7582
   sed -i 's/;MorePrivacy = no/MorePrivacy = yes/g' /etc/ngircd/ngircd.conf
@@ -7684,7 +7684,7 @@ function install_wiki {
7684 7684
 
7685 7685
   get_wiki_admin_password
7686 7686
   if [ ! $WIKI_ADMIN_PASSWORD ]; then
7687
-      WIKI_ADMIN_PASSWORD=$(openssl rand -base64 16)
7687
+      WIKI_ADMIN_PASSWORD="$(openssl rand -base64 16)"
7688 7688
   fi
7689 7689
   HASHED_WIKI_PASSWORD=$(echo -n "$WIKI_ADMIN_PASSWORD" | md5sum | awk -F ' ' '{print $1}')
7690 7690
   echo -n "$MY_USERNAME:$HASHED_WIKI_PASSWORD:$MY_NAME:$MY_EMAIL:admin,user,upload" > /var/lib/dokuwiki/acl/users.auth.php
@@ -8117,7 +8117,7 @@ function install_blog {
8117 8117
   # create a user password
8118 8118
   get_blog_admin_password
8119 8119
   if [ ! $FULLBLOG_ADMIN_PASSWORD ]; then
8120
-      FULLBLOG_ADMIN_PASSWORD=$(openssl rand -base64 16)
8120
+      FULLBLOG_ADMIN_PASSWORD="$(openssl rand -base64 16)"
8121 8121
       echo '' >> /home/$MY_USERNAME/README
8122 8122
       echo '' >> /home/$MY_USERNAME/README
8123 8123
       echo 'HTMLy Blog' >> /home/$MY_USERNAME/README
@@ -8187,7 +8187,7 @@ function install_gnu_social {
8187 8187
 
8188 8188
   get_mariadb_gnusocial_admin_password
8189 8189
   if [ ! $MICROBLOG_ADMIN_PASSWORD ]; then
8190
-      MICROBLOG_ADMIN_PASSWORD=$(openssl rand -base64 32)
8190
+      MICROBLOG_ADMIN_PASSWORD="$(openssl rand -base64 32)"
8191 8191
       echo '' >> /home/$MY_USERNAME/README
8192 8192
       echo '' >> /home/$MY_USERNAME/README
8193 8193
       echo 'GNU Social' >> /home/$MY_USERNAME/README
@@ -8430,7 +8430,7 @@ function install_redmatrix {
8430 8430
 
8431 8431
   get_mariadb_redmatrix_admin_password
8432 8432
   if [ ! $REDMATRIX_ADMIN_PASSWORD ]; then
8433
-      REDMATRIX_ADMIN_PASSWORD=$(openssl rand -base64 32)
8433
+      REDMATRIX_ADMIN_PASSWORD="$(openssl rand -base64 32)"
8434 8434
       echo '' >> /home/$MY_USERNAME/README
8435 8435
       echo '' >> /home/$MY_USERNAME/README
8436 8436
       echo 'Red Matrix' >> /home/$MY_USERNAME/README
@@ -9283,10 +9283,10 @@ function install_voip {
9283 9283
 
9284 9284
   get_voip_server_password
9285 9285
   if [ ! $VOIP_SERVER_PASSWORD ]; then
9286
-      VOIP_SERVER_PASSWORD=$(openssl rand -base64 16)
9286
+      VOIP_SERVER_PASSWORD="$(openssl rand -base64 16)"
9287 9287
   fi
9288 9288
   if [ ${#VOIP_SERVER_PASSWORD} -lt $MINIMUM_PASSWORD_LENGTH ]; then
9289
-      VOIP_SERVER_PASSWORD=$(openssl rand -base64 16)
9289
+      VOIP_SERVER_PASSWORD="$(openssl rand -base64 16)"
9290 9290
   fi
9291 9291
 
9292 9292
   # Make an ssl cert for the server

+ 1
- 1
src/freedombone-splitkey 파일 보기

@@ -120,7 +120,7 @@ shred -zu /home/$MY_USERNAME/pubkey.txt
120 120
 
121 121
 # generate a random passphrase if one isn't supplied
122 122
 if [ ! $PASSPHRASE ]; then
123
-    PASSPHRASE=$(openssl rand -base64 64)
123
+    PASSPHRASE="$(openssl rand -base64 100)"
124 124
 fi
125 125
 
126 126
 # encrypt the keys file with a passphrase