Bob Mottram 9 лет назад
Родитель
Сommit
2c9566117a
1 измененных файлов: 3 добавлений и 6 удалений
  1. 3
    6
      src/freedombone

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

@@ -593,8 +593,8 @@ function create_database {
593 593
         mkdir $INSTALL_DIR
594 594
     fi
595 595
     echo "create database ${app_name};
596
-CREATE USER '${app_name}admin'@'localhost' IDENTIFIED BY '${app_admin_password}';
597
-GRANT ALL PRIVILEGES ON ${app_name}.* TO '${app_name}admin'@'localhost';
596
+CREATE USER '${app_name}admin@localhost' IDENTIFIED BY '${app_admin_password}';
597
+GRANT ALL PRIVILEGES ON ${app_name}.* TO '${app_name}admin@localhost';
598 598
 quit" > $INSTALL_DIR/batch.sql
599 599
     chmod 600 $INSTALL_DIR/batch.sql
600 600
     mysql -u root --password="$MARIADB_PASSWORD" < $INSTALL_DIR/batch.sql
@@ -8296,9 +8296,6 @@ function install_gnu_social {
8296 8296
 
8297 8297
     chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8298 8298
     chown www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8299
-    chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/avatar
8300
-    chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/background
8301
-    chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/file
8302 8299
     chmod +x /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/scripts/maildaemon.php
8303 8300
 
8304 8301
     get_mariadb_gnusocial_admin_password
@@ -8531,7 +8528,7 @@ function install_gnu_social {
8531 8528
     ${gnu_social_installer} --host="localhost" --database="gnusocial" \
8532 8529
                             --dbtype=mysql --username="root" -v \
8533 8530
                             --password="$MARIADB_PASSWORD" \
8534
-                            --sitename="My Social Network" --fancy \
8531
+                            --sitename="My Social Network" --fancy='yes' \
8535 8532
                             --admin-nick="gnusocialadmin" \
8536 8533
                             --admin-pass="$MICROBLOG_ADMIN_PASSWORD" \
8537 8534
                             --site-profile="community" \