[Savannah-cvs] /srv/bzr/administration r248: More work on identifying scripts to add to the repo + updates

[Sylvain Beucler]

------------------------------------------------------------
revno: 248
committer: Sylvain Beucler <address@hidden>
branch nick: infra
timestamp: Sat 2010-12-18 23:39:14 +0100
message:
  More work on identifying scripts to add to the repo + updates
modified:
  arch.txt
  backup/dl.sh
  cvs.txt
  download.txt
  git.txt
  internal.txt

=== modified file 'arch.txt'
--- a/arch.txt  2008-05-23 18:47:32 +0000
+++ b/arch.txt  2010-12-18 22:39:14 +0000
@@ -9,7 +9,6 @@
 
 ## Savane
 ./savane.sh
-#file: /etc/cron.d/sv_arch
 
 
 ## ArchZoom

=== modified file 'backup/dl.sh'
--- a/backup/dl.sh      2010-12-18 22:22:32 +0000
+++ b/backup/dl.sh      2010-12-18 22:39:14 +0000
@@ -141,6 +141,9 @@
   --include '/etc/cron.d/sv' \
   \
   --include '/etc/' \
+  --include '/etc/mirmon.conf' \
+  \
+  --include '/etc/' \
   --include '/etc/apache2/' \
   --include '/etc/apache2/sites-available/***' \
   --include '/etc/apache2/conf.d/' \
@@ -164,6 +167,16 @@
   \
   --exclude '*~' \
   \
+  --include '/usr/' \
+  --include '/usr/sbin/' \
+  --include '/usr/sbin/rmlist' \
+  --include '/usr/sbin/config_list' \
+  --include '/usr/' \
+  --include '/usr/lib/' \
+  --include '/usr/lib/mailman/' \
+  --include '/usr/lib/mailman/bin/' \
+  --include '/usr/lib/mailman/bin/change_pw' \
+  \
   --include '/etc/' \
   --include '/etc/mysql/' \
   --include '/etc/mysql/my.cnf' \

=== modified file 'cvs.txt'
--- a/cvs.txt   2010-01-01 19:23:00 +0000
+++ b/cvs.txt   2010-12-18 22:39:14 +0000
@@ -7,7 +7,7 @@
 
 
 # Compilation
-# file: /vservers/builder/usr/src/patched/ccvs/patches/
+# file: builder:/usr/src/patched/ccvs/patches/
 
 # Currently built from source + patches: 1 from Debian to fix
 # compression bug, 2 backports for from unreleased CVS 1.12.14, 1
@@ -89,7 +89,6 @@
 
 
 apt-get install openssh-server
-#file: cp -a /etc/ssh/ssh_host_*
 
 # Edit /etc/ssh/sshd_config; look at the end of the file
 invoke-rc.d ssh start
@@ -136,20 +135,7 @@
 
 # Or just run it through xined, still as nobody:
 sed -i -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=inetd/" /etc/default/rsync
-# file: /etc/xinetd.d/rsync
-cat <<'EOF' > /etc/xinetd.d/rsync
-service rsync
-{
-        disable         = no
-        socket_type     = stream
-        wait            = no
-        user            = nobody
-        bind            = 199.232.41.69
-        server          = /usr/bin/rsync
-        server_args     = --daemon
-}
-EOF
-
+# functions/rsync-anonymous.txt
 
 # Migration:
 # rm all /sources/* and /web/* _symlinks_

=== modified file 'download.txt'
--- a/download.txt      2010-12-18 22:22:32 +0000
+++ b/download.txt      2010-12-18 22:39:14 +0000
@@ -37,13 +37,18 @@
 a2dismod userdir
 
 # enable rsync
-# file: /etc/rsync.conf
-# file: /etc/init.d/rsync
-# -> add '--chuid nobody:' to start-stop-daemon
-# edit /etc/default/rsync
-# RSYNC_ENABLE=true
-# RSYNC_OPTS='--address=199.232.41.69'
-# RSYNC_NICE='10'
+# functions/rsync-anonymous.txt
+cat <<EOF > /etc/rsync.conf
+use chroot = no
+
+[releases]
+        comment = Download area
+        path = /srv/download
+
+[audio-video]
+        comment = GNU and FSF audio and video repository
+        path = /srv/audio-video
+EOF
 
 ##
 # Autoredirect setup
@@ -80,7 +85,7 @@
 #make install
 
 aptitude install mirmon
-# file: /etc/miron.conf
+# file: /etc/mirmon.conf
 # file: /etc/apache2/sites-available/download
 touch /var/lib/mirmon/state
 mirmon -v -get all

=== modified file 'git.txt'
--- a/git.txt   2010-09-01 18:28:46 +0000
+++ b/git.txt   2010-12-18 22:39:14 +0000
@@ -135,7 +135,7 @@
 ln -s ../../git-logo.png
 ln -s ../../git-favicon.png
 
-# file: /etc/apache2/sites-available/cvs.inc
+# file: /etc/apache2/sites-available/git
 # (SetEnv GITWEB /etc/gitweb.conf)
 # file: /etc/gitweb.conf
 # (set the repository location to /srv/git/sources/)

=== modified file 'internal.txt'
--- a/internal.txt      2009-02-01 19:44:28 +0000
+++ b/internal.txt      2010-12-18 22:39:14 +0000
@@ -14,13 +14,14 @@
 mkdir -m 700 /dumps/
 # file: /etc/logrotate.d/savane
 
-# Apt-proxy is too buggy
-#aptitude --assume-yes install apt-proxy
-aptitude --assume-yes install lighttpd
-# Disabled:
-##echo "server.port = 9999" >> /etc/lighttpd/lighttpd.conf
-aptitude install debmirror patch
-#file: /etc/cron.daily/update-mirror
+# Approx
+apt-get install approx
+cat <<EOF >> /etc/approx/approx.conf
+debian                 http://ftp.us.debian.org/debian
+debian-security                http://security.debian.org
+debian-backports.org   http://backports.debian.org/debian-backports
+debian-volatile                http://volatile.debian.org/debian-volatile
+EOF
 
 # TODO: mail system
 # * Internet site
@@ -34,8 +35,8 @@
 
 
 # Savane
+touch /etc/cron.d/savane
 ./savane.sh
-# file: /etc/cron.d/savane
 
 # file: /usr/sbin/newlist
 # file: /usr/sbin/config_list