From 01c03223c2c559deec0191dd7a100e152981e1e2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 15 Jun 2009 15:13:24 -0700
Subject: Script to set up new status networks

---
 scripts/setup.cfg.sample | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 scripts/setup.cfg.sample

(limited to 'scripts/setup.cfg.sample')

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
new file mode 100644
index 000000000..4194bc146
--- /dev/null
+++ b/scripts/setup.cfg.sample
@@ -0,0 +1,11 @@
+# CONFIGURATION FILE for setup_status_network.sh
+
+# Base database name; full name will include nickname
+
+export DBBASE=_example_net
+export USERBASE=_example_net
+export ADMIN=root
+export ADMINPASS=yourpassword
+export SITEDB=example_net_site
+export AVATARBASE=/var/www/avatar.example.net
+
-- 
cgit v1.2.3-54-g00ecf


From 85b4c24188502ce3f8cef32cfba37ab91c8a648f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 17 Jun 2009 16:30:16 -0700
Subject: add dbhost argument for status network setup

---
 scripts/setup.cfg.sample        | 1 +
 scripts/setup_status_network.sh | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'scripts/setup.cfg.sample')

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index 4194bc146..450b9c30a 100644
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -2,6 +2,7 @@
 
 # Base database name; full name will include nickname
 
+export DBHOST=masterdb.example.net
 export DBBASE=_example_net
 export USERBASE=_example_net
 export ADMIN=root
diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index d80612b94..e1d14593f 100755
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -11,13 +11,13 @@ 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;
+    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';
-- 
cgit v1.2.3-54-g00ecf


From 545cbb2c82306872af4a227fd4fc7088da8e9a8c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 23 Jun 2009 09:18:10 -0700
Subject: make pwgen command configurable

---
 scripts/setup.cfg.sample        | 1 +
 scripts/setup_status_network.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/setup.cfg.sample')

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index 450b9c30a..72e6a21af 100644
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -9,4 +9,5 @@ export ADMIN=root
 export ADMINPASS=yourpassword
 export SITEDB=example_net_site
 export AVATARBASE=/var/www/avatar.example.net
+export PWDGEN="pwdgen 20"
 
diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index e1d14593f..cf9f78315 100755
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -5,7 +5,7 @@ source ./setup.cfg
 export nickname=$1
 export sitename=$2
 
-export password=`pwgen 20`
+export password=`$PWDGEN`
 export database=$nickname$DBBASE
 export username=$nickname$USERBASE
 
-- 
cgit v1.2.3-54-g00ecf


From 009e40834c70c0e0b430552d37880a04be327465 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 23 Jun 2009 09:19:54 -0700
Subject: pwgen not pwdgen

---
 scripts/setup.cfg.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/setup.cfg.sample')

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index 72e6a21af..dd3c2705f 100644
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -9,5 +9,5 @@ export ADMIN=root
 export ADMINPASS=yourpassword
 export SITEDB=example_net_site
 export AVATARBASE=/var/www/avatar.example.net
-export PWDGEN="pwdgen 20"
+export PWDGEN="pwgen 20"
 
-- 
cgit v1.2.3-54-g00ecf