|
@@ -84,6 +84,7 @@ PRIVATE_MAILING_LIST=
|
84
|
84
|
# Domain name or freedns subdomain for microblog installation
|
85
|
85
|
MICROBLOG_DOMAIN_NAME=
|
86
|
86
|
MICROBLOG_REPO="git://gitorious.org/social/mainline.git"
|
|
87
|
+MICROBLOG_ADMIN_PASSWORD=
|
87
|
88
|
|
88
|
89
|
# Domain name or redmatrix installation
|
89
|
90
|
REDMATRIX_DOMAIN_NAME=
|
|
@@ -2205,7 +2206,6 @@ function install_mariadb {
|
2205
|
2206
|
|
2206
|
2207
|
if [ ! $MARIADB_PASSWORD ]; then
|
2207
|
2208
|
MARIADB_PASSWORD=$(openssl rand -base64 32)
|
2208
|
|
- prosodyctl register $MY_USERNAME $DOMAIN_NAME $XMPP_PASSWORD
|
2209
|
2209
|
echo '' >> /home/$MY_USERNAME/README
|
2210
|
2210
|
echo "Your MariaDB password is: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
|
2211
|
2211
|
echo '' >> /home/$MY_USERNAME/README
|
|
@@ -2254,6 +2254,22 @@ function install_gnu_social {
|
2254
|
2254
|
chmod +x /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/scripts/maildaemon.php
|
2255
|
2255
|
fi
|
2256
|
2256
|
|
|
2257
|
+ if [ ! $MICROBLOG_ADMIN_PASSWORD ]; then
|
|
2258
|
+ MICROBLOG_ADMIN_PASSWORD=$(openssl rand -base64 32)
|
|
2259
|
+ echo '' >> /home/$MY_USERNAME/README
|
|
2260
|
+ echo "Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
|
|
2261
|
+ echo '' >> /home/$MY_USERNAME/README
|
|
2262
|
+ chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
|
2263
|
+ fi
|
|
2264
|
+
|
|
2265
|
+ echo "create database gnusocial;
|
|
2266
|
+CREATE USER 'gnusocialadmin'@'localhost' IDENTIFIED BY '$MICROBLOG_ADMIN_PASSWORD';
|
|
2267
|
+GRANT ALL PRIVILEGES ON gnusocial.* TO 'gnusocialadmin'@'localhost';
|
|
2268
|
+quit" > $INSTALL_DIR/batch.sql
|
|
2269
|
+ chmod 600 $INSTALL_DIR/batch.sql
|
|
2270
|
+ mysql -u root -p $MARIADB_PASSWORD < $INSTALL_DIR/batch.sql
|
|
2271
|
+ shred -zu $INSTALL_DIR/batch.sql
|
|
2272
|
+
|
2257
|
2273
|
echo 'install_gnu_social' >> $COMPLETION_FILE
|
2258
|
2274
|
}
|
2259
|
2275
|
|