[D-community-commits] r289 - in trunk/fai-config-dir: files/etc/apache2/sites-available/debian-community.org files/etc/awstats/awstats.debian-community.org.conf files/etc/hosts scripts/LDAPSERVER

[holger at alioth.debian.org]

Author: holger
Date: 2008-04-04 09:05:37 +0000 (Fri, 04 Apr 2008)
New Revision: 289

Modified:
   trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
   trunk/fai-config-dir/files/etc/awstats/awstats.debian-community.org.conf/WEBSERVER
   trunk/fai-config-dir/files/etc/hosts/bikeshed
   trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd
   trunk/fai-config-dir/scripts/LDAPSERVER/20-userdir-ldap
Log:
change ip address to the new one

Modified: trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER	2008-03-27 13:57:59 UTC (rev 288)
+++ trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER	2008-04-04 09:05:37 UTC (rev 289)
@@ -102,12 +102,12 @@
 	<Location /cgi-bin/awstats.pl>
 	Order allow,deny
 	allow from 127.0.0.1
-	allow from 157.193.39.172
+	allow from 157.193.40.51
 	</Location>
 	<Location /awstats/>
 	Order allow,deny
 	allow from 127.0.0.1
-	allow from 157.193.39.172
+	allow from 157.193.40.51
 	</Location>
 
 </VirtualHost>

Modified: trunk/fai-config-dir/files/etc/awstats/awstats.debian-community.org.conf/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/etc/awstats/awstats.debian-community.org.conf/WEBSERVER	2008-03-27 13:57:59 UTC (rev 288)
+++ trunk/fai-config-dir/files/etc/awstats/awstats.debian-community.org.conf/WEBSERVER	2008-04-04 09:05:37 UTC (rev 289)
@@ -165,7 +165,7 @@
 # Note: You can also use @/mypath/myfile if list of aliases are in a file.
 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
 #
-HostAliases="localhost 127.0.0.1 157.193.39.172  bikeshed.debian-community.org bikeshed planet.??"
+HostAliases="localhost 127.0.0.1 157.193.40.51  bikeshed.debian-community.org bikeshed planet.??"
 
 
 # If you want to have hosts reported by name instead of ip address, AWStats

Modified: trunk/fai-config-dir/files/etc/hosts/bikeshed
===================================================================
--- trunk/fai-config-dir/files/etc/hosts/bikeshed	2008-03-27 13:57:59 UTC (rev 288)
+++ trunk/fai-config-dir/files/etc/hosts/bikeshed	2008-04-04 09:05:37 UTC (rev 289)
@@ -1,5 +1,5 @@
 127.0.0.1	localhost 
-157.193.39.172	bikeshed.debian-community.org bikeshed
+157.193.40.51	bikeshed.debian-community.org bikeshed
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback

Modified: trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd
===================================================================
--- trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd	2008-03-27 13:57:59 UTC (rev 288)
+++ trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd	2008-04-04 09:05:37 UTC (rev 289)
@@ -13,37 +13,37 @@
 #tmp
 # Ugly hack to remove the default database
 #if ! $ROOTCMD ldapsearch -h localhost -x -b "ou=People,dc=debian-community,dc=org" &>/dev/null; then
-#    $ROOTCMD /etc/init.d/slapd stop 
-#    sleep 2
-#    $ROOTCMD rm -rf /var/lib/ldap/*
-#    echo -n "Creating initial LDAP directory..."
-#    TMPFILE=`mktemp`
-#    cat > $TMPFILE <<- EOF 
-#dn: dc=org
-#dc: net
-#objectClass: top
-#objectClass: domain
-#
-#dn: dc=debian-community,dc=org
-#dc: visi
-#objectClass: top
-#objectClass: domain
-#
-#dn: ou=users,dc=debian-community,dc=org
-#ou: users
-#objectClass: top
-#objectClass: organizationalUnit
-#
-#dn: uid=admin,ou=users,dc=debian-community,dc=org
-#uid: admin
-#cn: LDAP administrator
-#objectClass: top
-#objectClass: groupOfNames
-#member: uid=holger,ou=users,dc=debian-community,dc=org
-#
-#dn: uid=holger,ou=users,dc=debian-community,dc=org
-#uid: holger
-#EOF
+    $ROOTCMD /etc/init.d/slapd stop 
+    sleep 2
+    $ROOTCMD rm -rf /var/lib/ldap/*
+    echo -n "Creating initial LDAP directory..."
+    TMPFILE=`mktemp`
+    cat > $TMPFILE <<- EOF 
+dn: dc=org
+dc: net
+objectClass: top
+objectClass: domain
+
+dn: dc=debian-community,dc=org
+dc: visi
+objectClass: top
+objectClass: domain
+
+dn: ou=users,dc=debian-community,dc=org
+ou: users
+objectClass: top
+objectClass: organizationalUnit
+
+dn: uid=admin,ou=users,dc=debian-community,dc=org
+uid: admin
+cn: LDAP administrator
+objectClass: top
+objectClass: groupOfNames
+member: uid=holger,ou=users,dc=debian-community,dc=org
+
+dn: uid=holger,ou=users,dc=debian-community,dc=org
+uid: holger
+EOF
 #   cat $TMPFILE | $ROOTCMD slapadd 
 #   rm $TMPFILE
 #   $ROOTCMD sudo -u openldap slapindex -v

Modified: trunk/fai-config-dir/scripts/LDAPSERVER/20-userdir-ldap
===================================================================
--- trunk/fai-config-dir/scripts/LDAPSERVER/20-userdir-ldap	2008-03-27 13:57:59 UTC (rev 288)
+++ trunk/fai-config-dir/scripts/LDAPSERVER/20-userdir-ldap	2008-04-04 09:05:37 UTC (rev 289)
@@ -4,3 +4,6 @@
 # GPL2 licenced
 
 fcopy -r -M /etc/userdir-ldap/
+$ROOTCMD mkdir -p /var/cache/userdir-ldap/web-cookies
+$ROOTCMD chown www-data.www-data /var/cache/userdir-ldap/web-cookies
+$ROOTCMD chmod 700 /var/cache/userdir-ldap/web-cookies