Adapting post_install for cuques

see #2

config.eol

+{"type_amon": {"owner": "gen_config", "val": "2zones-amonecole-cuques"}, "adresse_ip_eth1_proxy_link": {"owner": "gen_config", "val": "10.20.1.2"}, "activer_ajout_hosts": {"owner": "gen_config", "val": "oui"}, "nom_domaine_local": {"owner": "gen_config", "val": "ecoletest.plandecuques.fr"}, "nom_court_hosts": {"owner": {"0": "gen_config"}, "val": {"0": "dnsproxy"}}, "activer_squid_auth": {"owner": "gen_config", "val": "non"}, "bareos_sd_password": {"owner": "forced", "val": "01006d73c6f13edbff49539ea6a50b744c26d4f1380cfad072df4daf"}, "bareos_db_mysql_password": {"owner": "gen_config", "val": "38a0a5ed7180cb6fc3660b4049dc111deecf5e67aed721e839e88536"}, "adresse_ip_fichier_link": {"owner": "gen_config", "val": "10.20.1.3"}, "web_url": {"owner": "gen_config", "val": "test.ac-marseille.fr"}, "bareos_dir_password": {"owner": "forced", "val": "548c71a8e99ce2452009f2d21d225da30e6f2bba95cb05bfc8cf7b98"}, "ip_haute_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "10.20.1.254"}}, "domaine_messagerie_etab": {"owner": "gen_config", "val": "test.ac-marseille.fr"}, "___version___": "2.6.2", "nom_long_hosts": {"owner": {"0": "gen_config"}, "val": {"0": "dnsproxy.ecoletest.plandecuques.fr"}}, "activer_dhcp": {"owner": "gen_config", "val": "oui"}, "bareos_dir_name": {"owner": "forced", "val": "amonecole-dir"}, "adresse_ip_hosts": {"owner": "gen_config", "val": ["10.20.1.2"]}, "bareos_fd_password": {"owner": "forced", "val": "0d2b71cdcc90c4367dcd47fe16bd7d308b7e22aca4c4fe36014c22e0"}, "nom_plage_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "ecole"}}, "system_mail_to": {"owner": "gen_config", "val": "root@test.ac-marseille.fr"}, "eth0_method": {"owner": "gen_config", "val": "dhcp"}, "ip_basse_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "10.20.1.20"}}, "ip_admin_eth0": {"owner": "gen_config", "val": ["192.168.211.1"]}, "cert_type": {"owner": "gen_config", "val": "autosign\u00e9"}, "ip_admin_eth1": {"owner": "gen_config", "val": ["10.20.0.30"]}, "numero_etab": {"owner": "gen_config", "val": "test"}, "netmask_admin_eth1": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "netmask_admin_eth0": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "bareos_db_type": {"owner": "forced", "val": "mysql"}, "esu_proxy_default": {"owner": "forced", "val": "oui"}, "ip_ssh_eth1": {"owner": "gen_config", "val": ["10.20.0.30"]}, "ip_ssh_eth0": {"owner": "gen_config", "val": ["192.168.211.228", "193.33.56.228"]}, "libelle_etab": {"owner": "gen_config", "val": "test"}, "smb_workgroup": {"owner": "gen_config", "val": "ecole-wg"}, "smb_netbios_name": {"owner": "gen_config", "val": "ecole-srv"}, "netmask_ssh_eth0": {"owner": {"1": "gen_config", "0": "gen_config"}, "val": {"1": "255.255.255.255", "0": "255.255.255.255"}}, "netmask_ssh_eth1": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "omapi_secret": {"owner": "forced", "val": "42f0707bbf047e86da7fb90aa0752f750503be5899135f2ea6542a34"}, "activer_exim_relay_smtp": {"owner": "gen_config", "val": "non"}, "adresse_ip_eth1": {"owner": "gen_config", "val": "10.20.1.1"}, "nom_machine": {"owner": "gen_config", "val": "ecoletest"}, "nom_academie": {"owner": "gen_config", "val": "ac-marseille"}}
\ No newline at end of file

creole/acng.conf

+
+# Letter case in directive names does not matter. Must be separated with colons.
+# Valid boolean values are a zero number for false, non-zero numbers for true.
+
+CacheDir: /var/cache/apt-cacher-ng
+
+# set empty to disable logging
+LogDir: /var/log/apt-cacher-ng
+
+# place to look for additional configuration and resource files if they are not
+# found in the configuration directory
+# SupportDir: /usr/lib/apt-cacher-ng
+
+# TCP (http) port
+# Set to 9999 to emulate apt-proxy
+Port:%%getVar('apt_cacher_port', 3142)
+
+# Addresses or hostnames to listen on. Multiple addresses must be separated by
+# spaces. Each entry must be an exact local address which is associated with a
+# local interface. DNS resolution is performed using getaddrinfo(3) for all
+# available protocols (IPv4, IPv6, ...). Using a protocol specific format will
+# create binding(s) only on protocol specific socket(s) (e.g. 0.0.0.0 will listen
+# only to IPv4).
+#
+# Default: not set, will listen on all interfaces and protocols
+#
+%set %%bindaddresses = "localhost" + ' ' + %%getVar('adresse_ip_eth1', '10.0.0.1')
+%if %%getVar('mode_conteneur_actif', 'non') == 'oui'
+    %set %%bindaddresses += ' ' + %%getVar('adresse_ip_br0', '192.0.2.1')
+%end if
+BindAddress: %%bindaddresses
+
+%if %%getVar('activer_proxy_client', 'non') == 'oui'
+# The specification of another proxy which shall be used for downloads.
+# Username and password are, and see manual for limitations.
+#
+Proxy: http://%%proxy_client_adresse:%%proxy_client_port
+%end if
+
+# Repository remapping. See manual for details.
+# EOLE configuration
+# Add backends to list of mirrors and remap to backends
+Remap-uburep: file:ubuntu_mirrors /ubuntu file:backends_ubuntu ; file:backends_ubuntu # Ubuntu Archives
+Remap-eolerep: file:backends_eole /eole ; file:backends_eole # EOLE archives
+
+# Virtual page accessible in a web browser to see statistics and status
+# information, i.e. under http://localhost:3142/acng-report.html
+ReportPage: acng-report.html
+
+# Forbid all downloads that don't run through preconfigured backends (.where)
+#ForceManaged: 0
+
+# Days before considering an unreferenced file expired (to be deleted).
+# Warning: if the value is set too low and particular index files are not
+# available for some days (mirror downtime) there is a risk of deletion of
+# still useful package files.
+ExTreshold: 4
+
+# Arbitrary set of data to append to request headers sent over the wire. Should
+# be a well formated HTTP headers part including newlines (DOS style) which
+# can be entered as escape sequences (\r\n).
+RequestAppendix: X-Tracking-Choice: do-not-track\r\n

do_postinstall.sh

@@ -22,9 +22,26 @@ then
     exit 1
 fi
 
-if [ ! -z "`which lxc-ls`" ]
+if [ -z "`which lxc-ls`" ]
 then
+    echo "Please run postinstall on the master"
+    exit 1
+fi
+
 DIR=`dirname $0`
+
+# Update
+Maj-Auto
+gen_conteneurs
+
+cp $DIR/config.eol /etc/eole/
+instance
+diagnose -L
+
+cp $DIR/creole/* /usr/share/eole/creole/modif
+gen_patch
+reconfigure
+
 for ctn in partage reseau
 do
     echo "Running post install for $ctn"
@@ -32,8 +49,3 @@ then
     ssh $ctn ./postinstall_$ctn.sh
     ssh $ctn rm postinstall_$ctn.sh
 done
-else
-    echo "Please run postinstall on the master"
-    exit 1
-fi
-

postinstall.sh

 #!/bin/bash
 git pull
 `dirname $0`/do_postinstall.sh
-

postinstall_partage.sh

@@ -60,4 +60,5 @@ do
     sleep 10
 done
 
+# TODO : change me
 cp ~/.ssh/id_rsa.pub /var/lib/tftpboot/ltsp/id_rsa.pub