This commit is contained in:
Bob Mottram 2016-02-03 15:41:46 +00:00
parent 052017fa56
commit 2c9566117a
1 changed files with 3 additions and 6 deletions

View File

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