From: Stephen Gran Date: Mon, 5 Oct 2009 00:09:41 +0000 (+0100) Subject: local-settins.conf is gone away - use local.yaml instead X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f234a737e32de46ed011121187e8410f2312c930;p=mirror%2Fdsa-puppet.git local-settins.conf is gone away - use local.yaml instead Signed-off-by: Stephen Gran --- diff --git a/modules/exim/files/common/local-settings.conf b/modules/exim/files/common/local-settings.conf deleted file mode 100644 index 8c8dd2f2e..000000000 --- a/modules/exim/files/common/local-settings.conf +++ /dev/null @@ -1,4 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## diff --git a/modules/exim/files/per-host/allegri.debian.org/local-settings.conf b/modules/exim/files/per-host/allegri.debian.org/local-settings.conf deleted file mode 100644 index 6ea5b7e5b..000000000 --- a/modules/exim/files/per-host/allegri.debian.org/local-settings.conf +++ /dev/null @@ -1,8 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -SMARTHOST = spohr.debian.org -SMARTHST_PORT = 587 -MAIL_IN_VIA_2025 = 1 diff --git a/modules/exim/files/per-host/ancina.debian.org/local-settings.conf b/modules/exim/files/per-host/ancina.debian.org/local-settings.conf deleted file mode 100644 index 6ea5b7e5b..000000000 --- a/modules/exim/files/per-host/ancina.debian.org/local-settings.conf +++ /dev/null @@ -1,8 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -SMARTHOST = spohr.debian.org -SMARTHST_PORT = 587 -MAIL_IN_VIA_2025 = 1 diff --git a/modules/exim/files/per-host/ball.debian.org/local-settings.conf b/modules/exim/files/per-host/ball.debian.org/local-settings.conf deleted file mode 100644 index 7b6b3f3b4..000000000 --- a/modules/exim/files/per-host/ball.debian.org/local-settings.conf +++ /dev/null @@ -1,9 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -RESERVEDADDRS = 0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : \ - 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : \ - 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5 - diff --git a/modules/exim/files/per-host/dijkstra.debian.org/local-settings.conf b/modules/exim/files/per-host/dijkstra.debian.org/local-settings.conf deleted file mode 100644 index 3cb3296c2..000000000 --- a/modules/exim/files/per-host/dijkstra.debian.org/local-settings.conf +++ /dev/null @@ -1,6 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -MAIL_RELAY = 1 diff --git a/modules/exim/files/per-host/kassia.debian.org/local-settings.conf b/modules/exim/files/per-host/kassia.debian.org/local-settings.conf deleted file mode 100644 index 5ca41aa1d..000000000 --- a/modules/exim/files/per-host/kassia.debian.org/local-settings.conf +++ /dev/null @@ -1,6 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -MAIL_IN_VIA_SUBMISSION = 1 diff --git a/modules/exim/files/per-host/piatti.debian.org/local-settings.conf b/modules/exim/files/per-host/piatti.debian.org/local-settings.conf deleted file mode 100644 index 6ea5b7e5b..000000000 --- a/modules/exim/files/per-host/piatti.debian.org/local-settings.conf +++ /dev/null @@ -1,8 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -SMARTHOST = spohr.debian.org -SMARTHST_PORT = 587 -MAIL_IN_VIA_2025 = 1 diff --git a/modules/exim/files/per-host/spohr.debian.org/local-settings.conf b/modules/exim/files/per-host/spohr.debian.org/local-settings.conf deleted file mode 100644 index 3cb3296c2..000000000 --- a/modules/exim/files/per-host/spohr.debian.org/local-settings.conf +++ /dev/null @@ -1,6 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -MAIL_RELAY = 1 diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index 8bdb36955..6861b44be 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -99,12 +99,6 @@ class exim { source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog", "puppet:///exim/common/logrotate-exim4-paniclog" ] ; - "/etc/exim4/local-settings.conf": - require => Package["exim4-daemon-heavy"], - source => [ "puppet:///exim/per-host/$fqdn/local-settings.conf", - "puppet:///exim/common/local-settings.conf" ], - notify => Exec["exim4 reload"] - ; "/etc/exim4/local-auto.conf": require => Package["exim4-daemon-heavy"], content => template("exim-local-auto.erb"), diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 8ae459830..d00e4efc2 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -121,8 +121,6 @@ allow_domain_literals = true # Other domain and host lists may follow. # @ is the local FQDN, @[] matches the IP adress of any local interface. -.include_if_exists /etc/exim4/local-settings.conf - domainlist local_domains = @ : \ @[] : \ localhost : \