X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_hosted;h=533ef85e7d4b0b4159ccb4d7e96de6be7d42b536;hp=1ffd17654001188654ccc4cb84589633e9515b1e;hb=03bfcbb4b3d51ab2fac7e293336ba230fb0a5bc0;hpb=a5a85db110bc4840b9806773b4b6e79298117ce4

diff --git a/vm_hosted b/vm_hosted
index 1ffd176..533ef85 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -249,9 +249,6 @@ rule_apt_configure () {
 		Pin: release a=$vm_lsb_name-backports
 		Pin-Priority: 200
 		EOF
-	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
-		deb http://nightly.openerp.com/trunk/nightly/deb/ ./
-		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
@@ -308,7 +305,7 @@ rule_dovecot_configure () {
 	sudo install -m 400 -o root -g root \
 	     "$tool"/var/pub/x509/$vm_domainname/imap/crt+crl.self-signed.pem \
 	 /etc/dovecot/$vm_domainname/imap/x509/crt+crl.self-signed.pem
-	sudo install -d -m 770 -o root -g adm \
+	sudo install -d -m 770 -o root -g root \
 	 /etc/skel/etc/mail \
 	 /etc/skel/etc/sieve
 	sudo install -d -m 1777 -o root -g root \
@@ -416,24 +413,7 @@ rule_filesystem_configure () {
 		${vm_lvm_lv}_home_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_home ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived
 		${vm_lvm_lv}_swap_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_swap ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived
 		EOF
-	sudo install -m 644 -o root -g root /dev/stdin /etc/default/tmpfs <<-EOF
-		LOCK_SIZE=5242880 # NOTE: 5MiB
-		RAMLOCK=yes
-		RAMSHM=yes
-		RAMTMP=yes
-		RUN_SIZE=10%
-		SHM_SIZE=
-		TMP_MODE=1777,nr_inodes=1000k,noatime
-		TMP_OVERFLOW_LIMIT=1024
-		 # NOTE: mount tmpfs on /tmp if there is less than the limit size (in kiB)
-		 #       on the root filesystem (overriding RAMTMP).
-		TMP_SIZE=200m
-		TMPFS_SIZE=20%VM
-		EOF
-	sudo install -m 775 -o root -g root \
-	 "$tool"/etc/init.d/tmpfs \
-	        /etc/init.d/tmpfs
-	sudo update-rc.d tmpfs defaults
+	rule tmpfs_configure
  }
 rule_initramfs_configure () {
 	sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/initramfs.conf <<-EOF
@@ -493,7 +473,127 @@ rule_initramfs_configure () {
 	 # NOTE: clefs générées par Debian
 	sudo update-initramfs -u
  }
-rule_locale_configure () {
+rule_gitolite_configure () {
+	local user=git
+	sudo debconf-set-selections <<-EOF
+		gitolite	gitolite/gituser	string	$user
+		gitolite	gitolite/adminkey	string	
+		gitolite	gitolite/gitdir	string	/home/$user
+		EOF
+	rule apt_get_install gitolite
+	getent passwd "$user" >/dev/null ||
+	sudo adduser \
+	 --disabled-password \
+	 --group \
+	 --shell /bin/bash \
+	 --system \
+	 "$user"
+	sudo chfn --full-name "$user" "$user"
+	eval local home\; home="~$user"
+	sudo install -d -m 770 -o "$user" -g "$user" \
+	 /etc/gitolite \
+	 "$home"/etc \
+	 "$home"/etc/ssh \
+	 "$home"/pub \
+	 "$home"/log \
+	 "$home"/log/gitolite \
+	 "$home"/log/gitolite/perf
+	sudo ln -fns /etc/gitolite "$home"/etc/gitolite
+	sudo ln -fns etc/gitolite/gitolite.rc "$home"/.gitolite.rc
+	sudo ln -fns etc/ssh "$home"/.ssh
+	sudo install -m 770 -o "$user" -g "$user" /dev/stdin \
+	 "$home"/etc/gitolite/gitolite.rc <<-EOF
+		#\$ADMIN_POST_UPDATE_CHAINS_TO = "hooks/post-update.secondary";
+		#\$BIG_INFO_CAP = 20;
+		#\$ENV{GL_SLAVES} = 'gitolite@server2 gitolite@server3';
+			# NOTE: Please use single quotes, not double quotes.
+		#\$GITWEB_URI_ESCAPE = 0;
+		\$GIT_PATH = "";
+		#\$GL_ADC_PATH = "";
+		\$GL_ADMINDIR = \$ENV{HOME} . "/etc/gitolite";
+		#\$GL_ALL_INCLUDES_SPECIAL = 0;
+		#\$GL_ALL_READ_ALL = 0;
+		\$GL_BIG_CONFIG = 0;
+		\$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_HOSTNAME = "git.$vm_domainname";
+			# NOTE: read doc/mirroring.mkd COMPLETELY before setting this.
+		#\$GL_HTTP_ANON_USER = "mob";
+		\$GL_KEYDIR = "\$GL_ADMINDIR/keydir";
+		\$GL_LOGT = \$ENV{HOME} . "/log/gitolite/%y-%m-%d.log";
+		#\$GL_NICE_VALUE = 0;
+		\$GL_NO_CREATE_REPOS = 0;
+		\$GL_NO_DAEMON_NO_GITWEB = 0;
+		\$GL_NO_SETUP_AUTHKEYS = 0;
+		\$GL_PACKAGE_CONF = "/usr/share/gitolite/conf";
+		\$GL_PACKAGE_HOOKS = "/usr/share/gitolite/hooks";
+		#\$GL_PERFLOGT = \$ENV{HOME} . "/log/gitolite/perf/%y-%m-%d.log";
+		#\$GL_REF_OR_FILENAME_PATT = qr(^[0-9a-zA-Z][0-9a-zA-Z._\\@/+ :,-]*\$);
+		\$GL_SITE_INFO = "git.$vm_domainname";
+		#\$GL_SLAVE_MODE = 0;
+		\$GL_WILDREPOS = 0;
+		#\$GL_WILDREPOS_DEFPERMS = 'R @all';
+		\$GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
+		\$HTPASSWD_FILE = "";
+		\$PROJECTS_LIST = \$ENV{HOME} . "/projects.list";
+		\$REPO_BASE = "pub";
+		\$REPO_UMASK = 0007;
+		\$RSYNC_BASE = "";
+		\$SVNSERVE = "";
+		#\$UPDATE_CHAINS_TO = "hooks/update.secondary";
+		#\$WEB_INTERFACE = "gitweb";
+		1;
+		EOF
+	sudo install -m 770 -o "$user" -g "$user" /dev/stdin \
+	 "$home"/etc/gitweb/gitweb.conf <<-EOF
+		\$commit_oneline_message_width = 70;
+		\$default_projects_order = 'age';
+		\$default_text_plain_charset = 'UTF-8';
+		@diff_opts = ();
+		\$favicon = "img/git-favicon.png";
+		\$git_temp = "/run/shm/gitweb";
+		\$home_footer = "/etc/gitweb/cgi/home-footer.cgi.inc";
+		\$home_header = "/etc/gitweb/cgi/home-header.cgi.inc";
+		\$home_link = "/";
+		\$home_link_str = 'd&eacute;p&ocirc;ts';
+		\$home_th_age = 'activit&eacute;';
+		\$home_th_descr = 'description';
+		\$home_th_owner = 'contact';
+		\$home_th_project = 'd&eacute;p&ocirc;t';
+		\$javascript = "js/gitweb.js";
+		\$logo = "img/git-logo.png";
+		\$my_uri = "";
+		\$projectroot = "../git";
+		\$projects_list = "/etc/gitolite/projects.list";
+		\$projects_list_description_width = 42;
+		\$projects_list_owner_width = 15;
+		\$search_str = "Filtre&nbsp;:";
+		\$site_footer = "/home/fai/pub/www/git.autogeree.net/cgi/site-footer.bin";
+		\$site_header = undef;
+		\$site_name = "git.$vm_domainname";
+		\$space_to_nbsp = 0;
+		@stylesheets = ("css/gitweb.css");#
+		\$untabify_tabstop = 2;
+		EOF
+	sudo install -m 600 -o "$user" -g "$user" \
+	 "$tool"/var/pub/ssh/"$user".key \
+	     "$home"/etc/ssh/"$user".pub
+	sudo -u "$user" \
+	 GL_RC="$home"/etc/gitolite/gitolite.rc \
+	 GIT_AUTHOR_NAME="$user" \
+		gl-setup -q "$home"/etc/ssh/"$user".pub "$user"
+	local d
+	for d in doc logs src
+	 do test ! -d "$home"/etc/gitolite/"$d" ||
+		rmdir "$home"/etc/gitolite/"$d"
+	 done
+	rule apt_get_install gitweb highlight
+	#sudo sv restart spawn-fcgi.git.80.git.heureux-cyclage.org
+	#sudo sv restart git-daemon.git.9418
+ }
+rule_locales_configure () {
 	sudo debconf-set-selections <<-EOF
 		locales	locales/default_environment_locale	select	None
 		locales	locales/locales_to_be_generated	multiselect	fr_FR.UTF-8 UTF-8
@@ -543,6 +643,10 @@ rule_login_configure () {
 		# Xen hypervisor console
 		hvc:2345:respawn:/sbin/getty 38400 hvc0
 		#xvc:2345:respawn:/sbin/getty 38400 xvc0
+		
+		#-- runit begin
+		SV:123456:respawn:/usr/sbin/runsvdir-start
+		#-- runit end
 		EOF
 	sudo install -m 644 -o root -g root /dev/stdin /etc/login.defs <<-EOF
 		MAIL_DIR         /var/mail
@@ -603,6 +707,10 @@ rule_mail_configure () {
 	rule procmail_configure
 	rule dovecot_configure
  }
+rule_mysql_configure () {
+	rule apt_get_install mysql-server-5.5
+	sudo service mysql restart
+ }
 rule_network_configure () {
 	sudo install -m 644 -o root -g root /dev/stdin /etc/hostname <<-EOF
 		$vm
@@ -964,21 +1072,60 @@ rule_postfix_configure () {
 	sudo postmap hash:/etc/postfix/$vm_domainname/virtual_alias
 	sudo service postfix restart
  }
+rule_postgresql_configure () {
+	rule apt_get_install postgresql-9.1
+	sudo service postgresql restart
+ }
+rule_openerp_configure () {
+	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
+		deb http://nightly.openerp.com/trunk/nightly/deb/ ./
+		EOF
+	sudo apt-get update
+	rule apt_get_install openerp
+ }
 rule_postgrey_configure () {
 	rule apt_get_install postgrey
 	sudo service postgrey restart
  }
 rule_procmail_configure () {
 	rule apt_get_install procmail
-	sudo install -d -m 770 -o root -g adm \
+	sudo install -d -m 770 -o root -g root \
 	 /etc/skel/etc/mail \
 	 /etc/skel/var/cache/mail \
 	 /etc/skel/var/log/mail \
 	 /etc/skel/var/mail
-	sudo install -m 660 -o root -g adm \
+	sudo install -m 660 -o root -g root \
 	 "$tool"/etc/skel/etc/mail/delivery.procmailrc \
 	        /etc/skel/etc/mail/delivery.procmailrc
  }
+rule_runit_configure () {
+	rule apt_get_install runit
+	local -; set +f
+	rm -f /etc/service/*
+	 # NOTE: runsvdir éteindra les services qui n'apparaîtront plus ici.
+	for sv in "$tool"/etc/sv/*
+	 do sv=${sv#"$tool"/etc/sv/}
+		sudo install -d -m 770 -o root -g root \
+		 /etc/sv/"$sv"
+		sudo install -m 770 -o root -g root \
+		 "$tool"/etc/sv/"$sv"/run \
+		        /etc/sv/"$sv"/run
+		if test -e "$tool"/etc/sv/"$sv"/log/run
+		 then
+			sudo install -d -m 770 -o root -g root \
+			 /etc/sv/"$sv"/log
+			sudo install -m 770 -o root -g root \
+			 "$tool"/etc/sv/"$sv"/log/run \
+			        /etc/sv/"$sv"/log/run
+		 fi
+		if test ! -x "$tool"/etc/sv/"$sv"/configure ||
+			"$tool"/etc/sv/"$sv"/configure
+		 then
+			ln -fns ../sv/"$sv" /etc/service/"$sv"
+			sv restart "$sv"
+		 else
+	 done
+ }
 rule_ssh_configure () {
 	ssh-keygen -F "$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
 	( while IFS= read -r line
@@ -1041,6 +1188,26 @@ rule_sysctl_configure () {
 	 done
 	sudo sysctl --system
  }
+rule_tmpfs_configure () {
+	sudo install -m 644 -o root -g root /dev/stdin /etc/default/tmpfs <<-EOF
+		LOCK_SIZE=5242880 # NOTE: 5MiB
+		RAMLOCK=yes
+		RAMSHM=yes
+		RAMTMP=yes
+		RUN_SIZE=10%
+		SHM_SIZE=
+		TMP_MODE=1777,nr_inodes=1000k,noatime
+		TMP_OVERFLOW_LIMIT=1024
+		 # NOTE: mount tmpfs on /tmp if there is less than the limit size (in kiB)
+		 #       on the root filesystem (overriding RAMTMP).
+		TMP_SIZE=200m
+		TMPFS_SIZE=20%VM
+		EOF
+	sudo install -m 775 -o root -g root \
+	 "$tool"/etc/init.d/tmpfs \
+	        /etc/init.d/tmpfs
+	sudo update-rc.d tmpfs defaults
+ }
 rule_time_configure () {
 	sudo install -m 644 -o root -g root /dev/stdin /etc/timezone <<-EOF
 		Europe/Paris
@@ -1069,16 +1236,39 @@ rule_user_add () { # SYNTAX: $user
 	 done
  }
 rule_user_configure () {
-	true
+	sudo install -m 660 -o root -g root /dev/stdin \
+	 /etc/adduser.conf <<-EOF
+		ADD_EXTRA_GROUPS=1
+		DHOME=/home
+		DIR_MODE=0750
+		DSHELL=/bin/bash
+		EXTRA_GROUPS="users"
+		FIRST_GID=1000
+		FIRST_SYSTEM_GID=100
+		FIRST_SYSTEM_UID=100
+		FIRST_UID=1000
+		GROUPHOMES=no
+		LAST_GID=29999
+		LAST_SYSTEM_GID=999
+		LAST_SYSTEM_UID=999
+		LAST_UID=29999
+		LETTERHOMES=no
+		NAME_REGEX="^[a-z][-a-z0-9_.]*\$"
+		QUOTAUSER="" # TODO: init
+		SETGID_HOME=no
+		SKEL=/etc/skel
+		SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
+		USERGROUPS=yes
+		USERS_GID=100
+		EOF
  }
 rule_user_admin_add () { # SYNTAX: $user
 	rule user_configure
 	local user=$1
-	id "$user" >/dev/null ||
+	getent passwd "$user" >/dev/null ||
 	sudo adduser --disabled-password "$user"
 	eval local home\; home="~$user"
 	sudo adduser "$user" sudo
-	sudo adduser "$user" users
 	sudo install -m 640 -o root -g root \
 	 "$tool"/var/pub/ssh/"$user".key \
 	 "$home"/etc/ssh/authorized_keys
@@ -1093,11 +1283,12 @@ rule_user_admin_configure () {
 	rule user_root_configure
  }
 rule_user_configure () {
-	sudo install -d -m 750 -o root -g adm \
+	sudo install -d -m 750 -o root -g root \
+	 /etc/skel \
 	 /etc/skel/etc \
 	 /etc/skel/etc/gpg \
 	 /etc/skel/etc/ssh
-	sudo install -d -m 770 -o root -g adm \
+	sudo install -d -m 770 -o root -g root \
 	 /etc/skel/var \
 	 /etc/skel/var/cache \
 	 /etc/skel/var/log \
@@ -1136,7 +1327,7 @@ rule_user_configure () {
 	        /etc/screenrc
  }
 rule_user_root_configure () {
-	sudo install -d -m 750 -o root -g adm \
+	sudo install -d -m 750 -o root -g root \
 	 /root/etc \
 	 /root/etc/gpg \
 	 /root/etc/ssh
@@ -1161,7 +1352,7 @@ rule_configure () {
 	rule apt_configure
 	rule git_configure
 	rule etckeeper_configure
-	rule locale_configure
+	rule locales_configure
 	rule time_configure
 	rule network_configure
 	rule filesystem_configure
@@ -1175,6 +1366,8 @@ rule_configure () {
 	#rule apache2_configure
 	rule nginx_configure
 	rule php5_fpm_configure
+	rule gitolite_configure
+	rule runit_configure
  }
 
 rule_luks_key_change () {