diff --git a/Cfg/etc/bind/db.fake/db.fake b/Cfg/etc/bind/db.fake/db.fake index 37ba26b..a266278 100644 --- a/Cfg/etc/bind/db.fake/db.fake +++ b/Cfg/etc/bind/db.fake/db.fake @@ -8,7 +8,7 @@ $TTL 10 1 ; TTL (1s) ) -@ IN NS 10.51.0.1 +@ IN NS 10.51.0.10 -@ IN A 10.51.0.1 -* IN A 10.51.0.1 +@ IN A 10.51.0.10 +* IN A 10.51.0.10 diff --git a/Metadata/groups.xml b/Metadata/groups.xml index 8de9fc0..098686f 100644 --- a/Metadata/groups.xml +++ b/Metadata/groups.xml @@ -386,6 +386,7 @@ + + diff --git a/Python/etc/monit/services b/Python/etc/monit/services index ec82d38..218a78f 100644 --- a/Python/etc/monit/services +++ b/Python/etc/monit/services @@ -209,6 +209,21 @@ for i in range(0,dernierecarte): @ if timestamp > 15 minutes then alert @ +if hostname in ['routeur']: + @# gunicorn + @check process gunicorn with pidfile /var/run/gunicorn/blacklist.pid + @ start program = "/etc/init.d/gunicorn start" + @ stop program = "/etc/init.d/gunicorn stop" + @ if 5 restarts within 5 cycles then timeout + @ +if hostname in ['routeur', 'komaz']: + @# nginx + @check process nginx with pidfile /var/run/nginx.pid + @ start program = "/etc/init.d/nginx start" + @ stop program = "/etc/init.d/nginx stop" + @ if 5 restarts within 5 cycles then timeout + @ + # on ne monitore pas les disques de canard if hostname in ['canard'] : done() diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces index 0b2ed51..c7d2bd7 100644 --- a/Python/etc/network/interfaces +++ b/Python/etc/network/interfaces @@ -30,8 +30,9 @@ iface %(interface)s inet static broadcast 138.231.143.255 gateway 138.231.136.4 dns-nameservers 138.231.136.98 138.231.136.9 - dns-search crans.org - post-up ip r add 138.231.144.0/21 dev %(interface)s via 138.231.136.247 src %(ip)s""" % { 'interface': interface, 'ip': pubip() } + dns-search crans.org""" % { 'interface': interface, 'ip': pubip() } + if not has('vlan-wifi'): + print """ post-up ip r add 138.231.144.0/21 dev %(interface)s via 138.231.136.247 src %(ip)s""" % { 'interface': interface, 'ip': pubip() } for line in additionnals: print " ", line diff --git a/Python/etc/ntp.conf b/Python/etc/ntp.conf index 0075de4..a654281 100644 --- a/Python/etc/ntp.conf +++ b/Python/etc/ntp.conf @@ -23,7 +23,21 @@ filegen peerstats file peerstats type day enable filegen clockstats file clockstats type day enable """ -if not has("domu"): +if has("ntp-server"): + print """# pool.ntp.org maps to about 1000 low-stratum NTP servers. Your server will +# pick a different set every time it starts up. Please consider joining the +# pool: +server ntp.ovh.net iburst +server 0.debian.pool.ntp.org iburst +server 1.debian.pool.ntp.org iburst +server 2.debian.pool.ntp.org iburst +server 3.debian.pool.ntp.org iburst +""" +elif has("secondary-ntp-server"): + print """# You do need to talk to an NTP server or two (or three). +server ntp.crans.org +""" +else: print """# You do need to talk to an NTP server or two (or three). server ntp.adm.crans.org """ @@ -46,9 +60,12 @@ print """ # that might be intended to block requests from certain clients could also end # up blocking replies from your own upstream servers. -# By default, exchange time with everybody, but don't allow configuration. -#restrict -4 default kod notrap nomodify nopeer noquery -#restrict -6 default kod notrap nomodify nopeer noquery +# By default, exchange time with everybody, but don't allow configuration.""" +if has("secondary-ntp-server"): + print """restrict -4 default kod notrap nomodify nopeer noquery +restrict -6 default kod notrap nomodify nopeer noquery""" + +print """ # Local users may interrogate the ntp server more closely. restrict 127.0.0.1