Merge branch 'testing' into -1.9.x

[quix0rs-gnu-social.git] / scripts / setup.cfg.sample

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index 4194bc146d0fcd62f4e5282a260a8cbc22368829..8d03b06f5e8db8c13e00f8ee888195cc32fe3fe6 100644 (file)
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -1,11 +1,14 @@
 # CONFIGURATION FILE for setup_status_network.sh
 
-# Base database name; full name will include nickname
-
+export DBHOST=localhost
+export DBHOSTNAME=masterdb.example.net
 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
+export BACKGROUNDBASE=/var/www/background.example.net
+export FILEBASE=/var/www/file.example.net
+export PWDGEN="pwgen 20"