Old and new format for admin password in readme

This commit is contained in:
Bob Mottram 2016-02-03 16:17:45 +00:00
parent d4fdbb29dd
commit d94b06829e
1 changed files with 4 additions and 1 deletions

View File

@ -3272,6 +3272,9 @@ function get_mariadb_gnusocial_admin_password {
if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//') MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
fi fi
if grep -q "Microblog administrator password" /home/$MY_USERNAME/README; then
MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Microblog administrator password" | awk -F ':' '{print $2}' | sed 's/^ *//')
fi
fi fi
} }
@ -8526,7 +8529,7 @@ function install_gnu_social {
# Create the configuration # Create the configuration
gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php
${gnu_social_installer} --server "${MICROBLOG_DOMAIN_NAME}" \ ${gnu_social_installer} --server "${MICROBLOG_DOMAIN_NAME}" \
--host="localhost" --database="gnusocial" \ --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='yes' \ --sitename="My Social Network" --fancy='yes' \