[Savannah-cvs] /srv/bzr/administration r246: Extract MySQL password from Savane config files + update frontend.txt

[Sylvain Beucler]

------------------------------------------------------------
revno: 246
committer: Sylvain Beucler <address@hidden>
branch nick: infra
timestamp: Sat 2010-12-18 21:48:33 +0100
message:
  Extract MySQL password from Savane config files + update frontend.txt
modified:
  backup/dl.sh
  frontend.txt
  vcs-noshell.txt

=== modified file 'backup/dl.sh'
--- a/backup/dl.sh      2010-12-18 19:56:20 +0000
+++ b/backup/dl.sh      2010-12-18 20:48:33 +0000
@@ -71,6 +71,7 @@
   --include '/etc/' \
   --include '/etc/cron.daily/' \
   --include '/etc/cron.daily/sv_list_groups' \
+  --include '/etc/cron.daily/sv' \
   \
   --include '/etc/' \
   --include '/etc/apache2/' \
@@ -84,7 +85,3 @@
   --include '/etc/savane/savane.conf.pl' \
   \
   --exclude '*'
-# Mangle passwords (TODO: split them in separate file)
-sed -i -e 's/\$sys_dbpasswd=.*/$sys_dbpasswd=XXXXX/' \
-  frontend.in.sv.gnu.org/etc/savane/.savane.conf.php \
-  frontend.in.sv.gnu.org/etc/savane/savane.conf.pl

=== modified file 'frontend.txt'
--- a/frontend.txt      2009-03-17 20:19:04 +0000
+++ b/frontend.txt      2010-12-18 20:48:33 +0000
@@ -10,6 +10,11 @@
 # Access for localhost and separate hosts / vservers
 mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE ON savane.* TO 'savannahscripts' 
IDENTIFIED BY 'SCRIPTPASS';"
 
+#file: /etc/cron.daily/sv_list_groups
+touch /root/.my.cnf
+chmod 600 /root/.my.cnf
+echo 'SCRIPTPASS' > /root/.my.cnf
+
 
 ## ZWiki
 aptitude install zope2.10
@@ -33,7 +38,7 @@
 
 ## XCache
 # http://trac.lighttpd.net/xcache/
-aptitude install -t etch-backports php5-xcache
+aptitude install php5-xcache
 
 # Or: manual installation:
 aptitude install build-essential
@@ -42,24 +47,25 @@
 ./configure --enable-xcache
 make
 make install
-cp xcache.ini /etc/php5/apache/conf.d/xcache.ini
+cp xcache.ini /etc/php5/apache2/conf.d/xcache.ini
 
+#file: /etc/php5/apache2/conf.d/xcache.ini
 # Modified conf:
-zend_extension = /usr/lib/php5/20060613+lfs/xcache.so
-; not needed:
-;extension = xcache.so
-
-xcache.admin.enable_auth =  Off
-;xcache.admin.user = "admin"
-;; pass=admin
-;xcache.admin.pass = "21232f297a57a5a743894a0e4a801fc3"
-
-xcache.size  =                64M
-; set to cpu count (cat /proc/cpuinfo |grep -c processor)
-xcache.count =                 4
-xcache.var_size  =           64M
-
-#file: sv.inc
+#zend_extension = /usr/lib/php5/20060613+lfs/xcache.so
+#; not needed:
+#;extension = xcache.so
+#
+#xcache.admin.enable_auth =  Off
+#;xcache.admin.user = "admin"
+#;; pass=admin
+#;xcache.admin.pass = "21232f297a57a5a743894a0e4a801fc3"
+#
+#xcache.size  =                64M
+#; set to cpu count (cat /proc/cpuinfo |grep -c processor)
+#xcache.count =                 4
+#xcache.var_size  =           64M
+
+# In sv.inc:
 # Alias /xcache /usr/src/xcache/admin
 # Alias /xcache /usr/share/xcache/admin
 

=== modified file 'vcs-noshell.txt'
--- a/vcs-noshell.txt   2009-06-01 11:15:29 +0000
+++ b/vcs-noshell.txt   2010-12-18 20:48:33 +0000
@@ -2,7 +2,20 @@
 cd /var/log/apache2
 mkdir -m 755 cvs svn git hg bzr www-test.gnu.org
 
--> cvs.txt
--> git.txt
--> bzr.txt
--> hg.txt
+
+# file:scramble: /etc/libnss-mysql.cfg
+# file:scramble: /etc/libnss-mysql-root.cfg
+
+#apt-get install libnss-extrausers
+# TODO: CRON:
+# TODO: doesn't add groups after login??
address@hidden:/etc/ssh# getent passwd > /var/lib/extrausers/passwd
address@hidden:/etc/ssh# getent group > /var/lib/extrausers/group
address@hidden:/etc/ssh# getent shadow > /var/lib/extrausers/shadow
+
+
+# Details for each VCS:
+# -> cvs.txt
+# -> git.txt
+# -> bzr.txt
+# -> hg.txt