|
@@ -3272,6 +3272,9 @@ function get_mariadb_gnusocial_admin_password {
|
3272
|
3272
|
if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
|
3273
|
3273
|
MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
3274
|
3274
|
fi
|
|
3275
|
+ if grep -q "Microblog administrator password" /home/$MY_USERNAME/README; then
|
|
3276
|
+ MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Microblog administrator password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
3277
|
+ fi
|
3275
|
3278
|
fi
|
3276
|
3279
|
}
|
3277
|
3280
|
|
|
@@ -8526,7 +8529,7 @@ function install_gnu_social {
|
8526
|
8529
|
# Create the configuration
|
8527
|
8530
|
gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php
|
8528
|
8531
|
${gnu_social_installer} --server "${MICROBLOG_DOMAIN_NAME}" \
|
8529
|
|
- --host="localhost" --database="gnusocial" \
|
|
8532
|
+ --host="localhost" --database="gnusocial" \
|
8530
|
8533
|
--dbtype=mysql --username="root" -v \
|
8531
|
8534
|
--password="$MARIADB_PASSWORD" \
|
8532
|
8535
|
--sitename="My Social Network" --fancy='yes' \
|