X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=91ec25ae0babdd15b705013bb33943849999f1bc;hb=a34a5ff2b077d249462b1626b706d8dc21347f5a;hp=b68dc3db0481b02fdba0d164074e9d1c45fff4d1;hpb=c18eb554fffb9736aaeda756f5f9c69c34f95fb3;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index b68dc3d..91ec25a 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -34,9 +34,7 @@ rule_git_configure () {
 	git config --replace branch.master.merge refs/remotes/master
 	local tool
 	tool=$(cd "$tool"; cd -)
-	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
-	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
-	sudo install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
+	install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
 		#!/bin/sh -efux
 		case \$1 in
 		 (refs/remotes/master)
@@ -245,23 +243,20 @@ rule_apache2_configure () { # XXX: cette règle n'est pas testée/mise-à-jour
  }
 rule_apt_configure () {
 	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
-		deb http://ftp.fr.debian.org/debian $vm_lsb_name main contrib non-free
+		deb http://ftp.rezopole.net/debian $vm_lsb_name main
 		EOF
-	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/$vm_lsb_name-backports.list <<-EOF
-		#deb http://backports.debian.org/debian-backports $vm_lsb_name-backports main contrib non-free
+	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/$vm_lsb_name-backports.list <<-EOF
+		deb http://ftp.rezopole.net/debian $vm_lsb_name-backports main
 		EOF
 	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF
 		Package: *
 		Pin: release a=$vm_lsb_name
-		Pin-Priority: 170
+		Pin-Priority: 200
 		
 		Package: *
 		Pin: release a=$vm_lsb_name-backports
-		Pin-Priority: 200
+		Pin-Priority: 170
 		EOF
-	#sudo install -m 660 -o root -g root /dev/stdin /etc/apt/apt.conf.d/02proxy-grenode <<-EOF
-	#	Acquire::http::Proxy "http://outils.grenode.net:3142";
-	#	EOF
 	sudo apt-get update
 	rule apt_get_install apticron
 	sudo install -m 644 -o root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF
@@ -475,10 +470,11 @@ rule_initramfs_configure () {
 			$users
 			EOF
 		 do eval local home\; home="~$user"
-			cat "$home"/etc/ssh/authorized_keys
+			sudo cat "$home"/etc/ssh/authorized_keys
 		 done
 	 done |
-	sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/root/.ssh/authorized_keys
+	sudo install -m 644 -o root -g root /dev/stdin \
+	 /etc/initramfs-tools/root/.ssh/authorized_keys
 	sudo rm -f \
 	 /etc/initramfs-tools/root/.ssh/id_rsa.dropbear \
 	 /etc/initramfs-tools/root/.ssh/id_rsa.pub \
@@ -550,7 +546,7 @@ rule_gitolite_configure () {
 		\$GL_CONF = "\$GL_ADMINDIR/conf/gitolite.conf";
 		\$GL_CONF_COMPILED = "\$GL_ADMINDIR/conf/gitolite.conf.pm";
 		#\$GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
-		\$GL_GITCONFIG_KEYS = "hooks\\..* repo\\..*";
+		\$GL_GITCONFIG_KEYS = "gitweb\\..* hooks\\..*";
 		#\$GL_HOSTNAME = "git.$vm_domainname";
 			# NOTE: read doc/mirroring.mkd COMPLETELY before setting this.
 		#\$GL_HTTP_ANON_USER = "mob";
@@ -570,7 +566,7 @@ rule_gitolite_configure () {
 		#\$GL_WILDREPOS_DEFPERMS = 'R @all';
 		\$GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
 		\$HTPASSWD_FILE = "";
-		\$PROJECTS_LIST = \$ENV{HOME} . "/projects.list";
+		\$PROJECTS_LIST = \$ENV{HOME} . "/etc/gitweb/projects.list";
 		\$REPO_BASE = "pub";
 		\$REPO_UMASK = 0007;
 		\$RSYNC_BASE = "";
@@ -784,34 +780,6 @@ rule_network_configure () {
 		    pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
 		EOF
  }
-rule_www_configure () {
-	rule adduser www \
-	 --disabled-login \
-	 --disabled-password \
-	 --group \
-	 --home /home/www \
-	 --shell /bin/false \
-	 --system
-	rule adduser log-www \
-	 --disabled-login \
-	 --disabled-password \
-	 --group \
-	 --home /home/www/log \
-	 --shell /bin/false \
-	 --system
-	#sudo adduser www www-data
-	sudo adduser www log-www
-	#sudo adduser log log-www
-	usermod --home /home/www/pub www-data
-	sudo install -d -m 751 -o www -g www \
-	 /home/www
-	sudo install -d -m 750 -o www -g www \
-	 /home/www/etc
-	sudo install -d -m 1771 -o www-data -g www-data \
-	 /home/www/pub
-	sudo install -d -m 1771 -o log-www -g log-www \
-	 /home/www/log
- }
 rule_nginx_configure () {
 	local -; set +f
 	rule apt_get_install nginx
@@ -893,6 +861,48 @@ rule_nginx_configure () {
 		#       de leurs groupes supplémentaires.
 	sudo service nginx restart
  }
+rule_nsd3_configure () { # NOTE: DNS autoritaire uniquement
+	local -; set +f
+	rule apt_get_install nsd m4
+	sudo rm -rf \
+	 /etc/nsd3/zone.d
+	sudo install -d -m 750 -o root -g nsd \
+	 /etc/nsd3/zone.d
+	{
+		cat <<-EOF
+			server:
+				ip-address: $vm_ipv4
+				ip4-only: yes
+			EOF
+		cat "$tool"/etc/nsd3/nsd.conf
+		local conf
+		for conf in "$tool"/etc/nsd3/zone.d/*.conf
+		 do conf=${conf#"$tool"/etc/nsd3/zone.d/}
+			local domain=${conf%.conf}
+			if test -e "$tool"/etc/nsd3/zone.d/"$domain".zone.m4
+			 then m4 \
+				 --define=ZONE_DOMAIN=$domain \
+				 --define=ZONE_SERIAL=$(cd "$tool" && git log -1 --format="%ct" -- etc/nsd3/zone.d/"$domain".zone.m4) \
+				 --define=VM_IP4=$vm_ipv4 \
+				        "$tool"/etc/nsd3/zone.d/"$domain".zone.m4
+			 else cat "$tool"/etc/nsd3/zone.d/"$domain".zone
+			 fi |
+			sudo install -m 440 -o root -g nsd /dev/stdin \
+			 /etc/nsd3/zone.d/"$domain".zone
+			sudo install -m 440 -o root -g nsd \
+			 "$tool"/etc/nsd3/zone.d/"$conf" \
+			        /etc/nsd3/zone.d/"$conf"
+			cat <<-EOF
+				zone:
+					name: $domain
+					zonefile: /etc/nsd3/zone.d/$domain.zone
+				EOF
+		 done
+	} |
+	sudo install -m 640 -o root -g nsd /dev/stdin \
+	 /etc/nsd3/nsd.conf
+	sudo service nsd3 restart
+ }
 rule_php5_fpm_configure () {
 	local -; set +f
 	rule apt_get_install \
@@ -1134,7 +1144,7 @@ rule_runit_configure () {
 		IFS= read -r sv_status_$sv_hash <<-EOF
 			$(sudo sv status "$sv")
 			EOF
-		rm -f /etc/service/"$sv"
+		sudo rm -f /etc/service/"$sv"
 	 done
 	for sv in ${1-"$tool"/etc/sv/*}
 	 # NOTE: configure et (re-)démarre les services
@@ -1155,7 +1165,7 @@ rule_runit_configure () {
 		 fi
 		test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
 		.         "$tool"/etc/sv/"$sv"/configure.sh
-		ln -fns ../sv/"$sv" /etc/service/"$sv"
+		sudo ln -fns ../sv/"$sv" /etc/service/"$sv"
 		eval local sv_status=\"\${sv_status_$sv_hash-}\"
 		case $sv_status in
 		 ("") true;;
@@ -1289,6 +1299,7 @@ rule_user_add () { # SYNTAX: $user
 	 done
  }
 rule_user_configure () {
+	rule apt_get_install bash-completion
 	sudo install -m 660 -o root -g root /dev/stdin \
 	 /etc/adduser.conf <<-EOF
 		ADD_EXTRA_GROUPS=1
@@ -1333,7 +1344,7 @@ rule_user_configure () {
 		    ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac
 		EOF
 	sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/etckeeper-unclean <<-EOF
-		%sudo ALL=(ALL) NOPASSWD: /usr/sbin/etckeeper unclean
+		%sudo ALL=(ALL) NOPASSWD: /usr/bin/etckeeper unclean
 		EOF
 	sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/env_keep <<-EOF
 		Defaults env_keep = " \\
@@ -1389,7 +1400,7 @@ rule_user_root_configure () {
 			$users
 			EOF
 		 do eval local home\; home="~$user"
-			cat "$home"/etc/ssh/authorized_keys
+			sudo cat "$home"/etc/ssh/authorized_keys
 		 done
 	 done |
 	sudo install -m 640 -o root -g root /dev/stdin /root/etc/ssh/authorized_keys
@@ -1398,6 +1409,34 @@ rule_user_root_configure () {
 	 do sudo gpg --import "$key"
 	 done
  }
+rule_www_configure () {
+	rule adduser www \
+	 --disabled-login \
+	 --disabled-password \
+	 --group \
+	 --home /home/www \
+	 --shell /bin/false \
+	 --system
+	rule adduser log-www \
+	 --disabled-login \
+	 --disabled-password \
+	 --group \
+	 --home /home/www/log \
+	 --shell /bin/false \
+	 --system
+	#sudo adduser www www-data
+	sudo adduser www log-www
+	#sudo adduser log log-www
+	usermod --home /home/www/pub www-data
+	sudo install -d -m 751 -o www -g www \
+	 /home/www
+	sudo install -d -m 750 -o www -g www \
+	 /home/www/etc
+	sudo install -d -m 1771 -o www-data -g www-data \
+	 /home/www/pub
+	sudo install -d -m 1771 -o log-www -g log-www \
+	 /home/www/log
+ }
 rule_configure () {
 	rule apt_configure
 	rule git_configure
@@ -1418,6 +1457,7 @@ rule_configure () {
 	rule php5_fpm_configure
 	rule nginx_configure
 	#rule apache2_configure
+	rule nsd3_configure
 	rule runit_configure
  }