Pārlūkot izejas kodu

Use default username for gnusocial admin

Bob Mottram 9 gadus atpakaļ
vecāks
revīzija
9ed150fc61
1 mainītis faili ar 10 papildinājumiem un 17 dzēšanām
  1. 10
    17
      src/freedombone

+ 10
- 17
src/freedombone Parādīt failu

591
 function create_database {
591
 function create_database {
592
     app_name="$1"
592
     app_name="$1"
593
     app_admin_password="$2"
593
     app_admin_password="$2"
594
+    app_admin_username=$3
594
     if [ ! -d $INSTALL_DIR ]; then
595
     if [ ! -d $INSTALL_DIR ]; then
595
         mkdir $INSTALL_DIR
596
         mkdir $INSTALL_DIR
596
     fi
597
     fi
598
+    if [ ! $app_admin_username ]; then
599
+        app_admin_username=${app_name}admin
600
+    fi
597
     echo "create database ${app_name};
601
     echo "create database ${app_name};
598
-CREATE USER '${app_name}admin@localhost' IDENTIFIED BY '${app_admin_password}';
599
-GRANT ALL PRIVILEGES ON ${app_name}.* TO '${app_name}admin@localhost';
602
+CREATE USER '$app_admin_username@localhost' IDENTIFIED BY '${app_admin_password}';
603
+GRANT ALL PRIVILEGES ON ${app_name}.* TO '$app_admin_username@localhost';
600
 quit" > $INSTALL_DIR/batch.sql
604
 quit" > $INSTALL_DIR/batch.sql
601
     chmod 600 $INSTALL_DIR/batch.sql
605
     chmod 600 $INSTALL_DIR/batch.sql
602
     mysql -u root --password="$MARIADB_PASSWORD" < $INSTALL_DIR/batch.sql
606
     mysql -u root --password="$MARIADB_PASSWORD" < $INSTALL_DIR/batch.sql
8310
         else
8314
         else
8311
             MICROBLOG_ADMIN_PASSWORD="$(openssl rand -base64 32)"
8315
             MICROBLOG_ADMIN_PASSWORD="$(openssl rand -base64 32)"
8312
         fi
8316
         fi
8313
-        echo '' >> /home/$MY_USERNAME/README
8314
-        echo '' >> /home/$MY_USERNAME/README
8315
-        echo $'GNU Social' >> /home/$MY_USERNAME/README
8316
-        echo '==========' >> /home/$MY_USERNAME/README
8317
-        echo $"Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
8318
-        echo '' >> /home/$MY_USERNAME/README
8319
-        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8320
-        chmod 600 /home/$MY_USERNAME/README
8321
     fi
8317
     fi
8322
 
8318
 
8323
-    create_database gnusocial "$MICROBLOG_ADMIN_PASSWORD"
8319
+    create_database gnusocial "$MICROBLOG_ADMIN_PASSWORD" $MY_USERNAME
8324
 
8320
 
8325
     if [ ! -f "/etc/aliases" ]; then
8321
     if [ ! -f "/etc/aliases" ]; then
8326
         touch /etc/aliases
8322
         touch /etc/aliases
8535
                             --dbtype=mysql --username="root" -v \
8531
                             --dbtype=mysql --username="root" -v \
8536
                             --password="$MARIADB_PASSWORD" \
8532
                             --password="$MARIADB_PASSWORD" \
8537
                             --sitename="My Social Network" --fancy='yes' \
8533
                             --sitename="My Social Network" --fancy='yes' \
8538
-                            --admin-nick="gnusocialadmin" \
8534
+                            --admin-nick="$MY_USERNAME" \
8539
                             --admin-pass="$MICROBLOG_ADMIN_PASSWORD" \
8535
                             --admin-pass="$MICROBLOG_ADMIN_PASSWORD" \
8540
                             --site-profile="community" \
8536
                             --site-profile="community" \
8541
                             --ssl=${gnu_social_ssl}
8537
                             --ssl=${gnu_social_ssl}
8559
     echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
8555
     echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
8560
 
8556
 
8561
     # some post-install instructions for the user
8557
     # some post-install instructions for the user
8562
-    if ! grep -q $"To set up your microblog go to" /home/$MY_USERNAME/README; then
8558
+    if ! grep -q $"Microblog administrator" /home/$MY_USERNAME/README; then
8563
         echo '' >> /home/$MY_USERNAME/README
8559
         echo '' >> /home/$MY_USERNAME/README
8564
         echo '' >> /home/$MY_USERNAME/README
8560
         echo '' >> /home/$MY_USERNAME/README
8565
         echo $'Microblog' >> /home/$MY_USERNAME/README
8561
         echo $'Microblog' >> /home/$MY_USERNAME/README
8566
         echo '=========' >> /home/$MY_USERNAME/README
8562
         echo '=========' >> /home/$MY_USERNAME/README
8567
-        echo $"Microblog administrator nickname: gnusocialadmin" >> /home/$MY_USERNAME/README
8563
+        echo $"Microblog administrator nickname: $MY_USERNAME" >> /home/$MY_USERNAME/README
8568
         echo $"Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
8564
         echo $"Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
8569
         echo '' >> /home/$MY_USERNAME/README
8565
         echo '' >> /home/$MY_USERNAME/README
8570
-        echo $'Under the *Access* settings:' >> /home/$MY_USERNAME/README
8571
-        echo '    /Invite only/ ticked' >> /home/$MY_USERNAME/README
8572
-        echo '' >> /home/$MY_USERNAME/README
8573
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8566
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8574
         chmod 600 /home/$MY_USERNAME/README
8567
         chmod 600 /home/$MY_USERNAME/README
8575
     fi
8568
     fi