Merge branch '0.8.x' into small-fixes

[quix0rs-gnu-social.git] / scripts / setup_status_network.sh

diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index d80612b94035c101c0571a9bc2a505deca7f0432..17440640e429d23e9af469ce6f8bd89b5b9bd6cc 100755 (executable)
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -1,30 +1,32 @@
 #!/bin/bash
 
-source ./setup.cfg
+source /etc/laconica/setup.cfg
 
 export nickname=$1
 export sitename=$2
 
-export password=`pwgen 20`
+export password=`$PWDGEN`
 export database=$nickname$DBBASE
 export username=$nickname$USERBASE
 
 # Create the db
 
-mysqladmin -u $ADMIN --password=$ADMINPASS create $database
+mysqladmin -h $DBHOST -u $ADMIN --password=$ADMINPASS create $database
 
-for f in laconica.sql sms_carrier.sql foreign_services.sql notice_source.sql; do
-    mysql -u $ADMIN --password=$ADMINPASS $database < ../db/$f;
+for f in laconica.sql innodb.sql sms_carrier.sql foreign_services.sql notice_source.sql; do
+    mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $database < ../db/$f;
 done
 
-mysql -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
+mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
 
 GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
 GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
 INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created)
-VALUES ('$nickname', '$DBHOST', '$username', '$password', '$database', '$sitename', now());
+VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now());
 
 ENDOFCOMMANDS
 
-mkdir $AVATARBASE/$nickname
-chmod a+w $AVATARBASE/$nickname
+for top in $AVATARBASE $FILEBASE $BACKGROUNDBASE; do
+    mkdir $top/$nickname
+    chmod a+w $top/$nickname
+done