Bob Mottram преди 10 години
родител
ревизия
82756f4cc9
променени са 1 файла, в които са добавени 22 реда и са изтрити 1 реда
  1. 22
    1
      install-freedombone.sh

+ 22
- 1
install-freedombone.sh Целия файл

@@ -2194,6 +2194,24 @@ function install_blog {
2194 2194
   echo 'install_blog' >> $COMPLETION_FILE
2195 2195
 }
2196 2196
 
2197
+function get_mariadb_password {
2198
+  if [ -f /home/$MY_USERNAME/README ]; then
2199
+	  if grep -q "MariaDB password" /home/$MY_USERNAME/README; then
2200
+		  MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//')
2201
+		  echo "MariaDB password: $MARIADB_PASSWORD"
2202
+	  fi
2203
+  fi
2204
+}
2205
+
2206
+function get_mariadb_gnusocial_admin_password {
2207
+  if [ -f /home/$MY_USERNAME/README ]; then
2208
+	  if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
2209
+		  MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
2210
+		  echo "MariaDB gnusocial admin password: $MICROBLOG_ADMIN_PASSWORD"
2211
+	  fi
2212
+  fi
2213
+}
2214
+
2197 2215
 function install_mariadb {
2198 2216
   if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
2199 2217
       return
@@ -2204,8 +2222,9 @@ function install_mariadb {
2204 2222
   apt-get -y --force-yes install software-properties-common
2205 2223
   apt-get -y update
2206 2224
 
2225
+  get_mariadb_password
2207 2226
   if [ ! $MARIADB_PASSWORD ]; then
2208
-      MARIADB_PASSWORD=$(openssl rand -base64 32)
2227
+	  MARIADB_PASSWORD=$(openssl rand -base64 32)
2209 2228
       echo '' >> /home/$MY_USERNAME/README
2210 2229
       echo "Your MariaDB password is: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
2211 2230
       echo '' >> /home/$MY_USERNAME/README
@@ -2230,6 +2249,7 @@ function install_gnu_social {
2230 2249
   fi
2231 2250
 
2232 2251
   install_mariadb
2252
+  get_mariadb_password
2233 2253
 
2234 2254
   apt-get -y --force-yes install php-gettext php5-curl php5-gd php5-mysql git
2235 2255
 
@@ -2254,6 +2274,7 @@ function install_gnu_social {
2254 2274
       chmod +x /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/scripts/maildaemon.php
2255 2275
   fi
2256 2276
 
2277
+  get_mariadb_gnusocial_admin_password
2257 2278
   if [ ! $MICROBLOG_ADMIN_PASSWORD ]; then
2258 2279
       MICROBLOG_ADMIN_PASSWORD=$(openssl rand -base64 32)
2259 2280
       echo '' >> /home/$MY_USERNAME/README