Bob Mottram 10 лет назад
Родитель
Сommit
7191ec280c
1 измененных файлов: 11 добавлений и 7 удалений
  1. 11
    7
      src/freedombone

+ 11
- 7
src/freedombone Просмотреть файл

1518
 
1518
 
1519
 function get_mariadb_git_admin_password {
1519
 function get_mariadb_git_admin_password {
1520
   if [ -f /home/$MY_USERNAME/README ]; then
1520
   if [ -f /home/$MY_USERNAME/README ]; then
1521
-      if grep -q "Gogs database password" /home/$MY_USERNAME/README; then
1522
-          GIT_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Gogs database password" | awk -F ':' '{print $2}' | sed 's/^ *//')
1521
+      if grep -q "Gogs admin user password" /home/$MY_USERNAME/README; then
1522
+          GIT_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Gogs admin user password" | awk -F ':' '{print $2}' | sed 's/^ *//')
1523
       fi
1523
       fi
1524
   fi
1524
   fi
1525
 }
1525
 }
6695
       GIT_ADMIN_PASSWORD=$(openssl rand -base64 32)
6695
       GIT_ADMIN_PASSWORD=$(openssl rand -base64 32)
6696
   fi
6696
   fi
6697
 
6697
 
6698
-  if ! grep -q "Gogs database user" /home/$MY_USERNAME/README; then
6698
+  if ! grep -q "Gogs admin user password" /home/$MY_USERNAME/README; then
6699
       echo '' >> /home/$MY_USERNAME/README
6699
       echo '' >> /home/$MY_USERNAME/README
6700
       echo '' >> /home/$MY_USERNAME/README
6700
       echo '' >> /home/$MY_USERNAME/README
6701
       echo 'Gogs' >> /home/$MY_USERNAME/README
6701
       echo 'Gogs' >> /home/$MY_USERNAME/README
6702
       echo '====' >> /home/$MY_USERNAME/README
6702
       echo '====' >> /home/$MY_USERNAME/README
6703
-      echo 'Gogs database user: gogsadmin' >> /home/$MY_USERNAME/README
6704
-      echo "Gogs database password: $GIT_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
6705
-      echo 'Gogs database name: gogs' >> /home/$MY_USERNAME/README
6703
+      echo 'Database type: MySql' >> /home/$MY_USERNAME/README
6704
+      echo 'Database host: 127.0.0.1:3306' >> /home/$MY_USERNAME/README
6705
+      echo 'Database user: root' >> /home/$MY_USERNAME/README
6706
+      echo "Database password: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
6707
+      echo 'Database name: gogs' >> /home/$MY_USERNAME/README
6708
+      echo 'Gogs admin user: gogsadmin' >> /home/$MY_USERNAME/README
6709
+      echo "Gogs admin user password: $GIT_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
6710
+      echo "Gogs admin user email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
6706
       echo '' >> /home/$MY_USERNAME/README
6711
       echo '' >> /home/$MY_USERNAME/README
6707
       echo 'Install Steps For First-time Run:' >> /home/$MY_USERNAME/README
6712
       echo 'Install Steps For First-time Run:' >> /home/$MY_USERNAME/README
6708
       echo 'Leave email service settings empty' >> /home/$MY_USERNAME/README
6713
       echo 'Leave email service settings empty' >> /home/$MY_USERNAME/README
6709
       echo 'Check "Enable Register Confirmation"' >> /home/$MY_USERNAME/README
6714
       echo 'Check "Enable Register Confirmation"' >> /home/$MY_USERNAME/README
6710
       echo 'Check "Enable Mail Notification"' >> /home/$MY_USERNAME/README
6715
       echo 'Check "Enable Mail Notification"' >> /home/$MY_USERNAME/README
6711
-      echo 'Enter some administrator account details and set an email address' >> /home/$MY_USERNAME/README
6712
   fi
6716
   fi
6713
 
6717
 
6714
   echo "create database gogs;
6718
   echo "create database gogs;