From: Stephen Gran Date: Sun, 15 Aug 2010 15:45:39 +0000 (+0100) Subject: move all files to explicit new-style module/ paths X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=d29ac285630ce6574f36c14b08e4de57f74a71f0 move all files to explicit new-style module/ paths Signed-off-by: Stephen Gran --- diff --git a/modules/apt-keys/manifests/init.pp b/modules/apt-keys/manifests/init.pp index df616881..c296ec55 100644 --- a/modules/apt-keys/manifests/init.pp +++ b/modules/apt-keys/manifests/init.pp @@ -7,12 +7,12 @@ class apt-keys { ; "/etc/apt/trusted-keys.d/backports.org.asc": - source => "puppet:///apt-keys/backports.org.asc", + source => "puppet:///modules/apt-keys/backports.org.asc", mode => 664, notify => Exec["apt-keys-update"], ; "/etc/apt/trusted-keys.d/db.debian.org.asc": - source => "puppet:///apt-keys/db.debian.org.asc", + source => "puppet:///modules/apt-keys/db.debian.org.asc", mode => 664, notify => Exec["apt-keys-update"], ; diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 16f84415..b5ec5806 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -15,16 +15,16 @@ class buildd { ; "/etc/apt/trusted-keys.d/buildd.debian.org.asc": - source => "puppet:///buildd/buildd.debian.org.asc", + source => "puppet:///modules/buildd/buildd.debian.org.asc", mode => 664, notify => Exec["apt-keys-update"], ; "/etc/schroot/mount-defaults": - source => "puppet:///buildd/mount-defaults", + source => "puppet:///modules/buildd/mount-defaults", require => Package["sbuild"] ; "/etc/cron.d/dsa-buildd": - source => "puppet:///buildd/cron.d-dsa-buildd", + source => "puppet:///modules/buildd/cron.d-dsa-buildd", require => Package["cron"] ; } diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp index 6f42e1ac..c2bd0d10 100644 --- a/modules/clamav/manifests/init.pp +++ b/modules/clamav/manifests/init.pp @@ -7,11 +7,11 @@ class clamav { file { "/etc/clamav-unofficial-sigs.dsa.conf": require => Package["clamav-unofficial-sigs"], - source => [ "puppet:///clamav/clamav-unofficial-sigs.dsa.conf" ] + source => [ "puppet:///modules/clamav/clamav-unofficial-sigs.dsa.conf" ] ; "/etc/clamav-unofficial-sigs.conf": require => Package["clamav-unofficial-sigs"], - source => [ "puppet:///clamav/clamav-unofficial-sigs.conf" ] + source => [ "puppet:///modules/clamav/clamav-unofficial-sigs.conf" ] ; } } diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index b228e69b..d67f8fb6 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -34,11 +34,11 @@ class ferm { ensure => directory, require => Package["ferm"]; "/etc/default/ferm": - source => "puppet:///ferm/ferm.default", + source => "puppet:///modules/ferm/ferm.default", require => Package["ferm"], notify => Exec["ferm restart"]; "/etc/ferm/ferm.conf": - source => "puppet:///ferm/ferm.conf", + source => "puppet:///modules/ferm/ferm.conf", require => Package["ferm"], mode => 0400, notify => Exec["ferm restart"]; @@ -58,7 +58,7 @@ class ferm { mode => 0400, notify => Exec["ferm restart"]; "/etc/logrotate.d/ulogd": - source => "puppet:///ferm/logrotate-ulogd", + source => "puppet:///modules/ferm/logrotate-ulogd", require => Package["logrotate"], ; } @@ -73,7 +73,7 @@ class ferm { 'true': { file { "/etc/ferm/conf.d/load_ftp_conntrack.conf": - source => "puppet:///ferm/conntrack_ftp.conf", + source => "puppet:///modules/ferm/conntrack_ftp.conf", require => Package["ferm"], notify => Exec["ferm restart"]; } diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 5357068e..3d474588 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -111,7 +111,7 @@ class ferm::per-host { cilea: { file { "/etc/ferm/conf.d/load_sip_conntrack.conf": - source => "puppet:///ferm/conntrack_sip.conf", + source => "puppet:///modules/ferm/conntrack_sip.conf", require => Package["ferm"], notify => Exec["ferm restart"]; } diff --git a/modules/kfreebsd/manifests/init.pp b/modules/kfreebsd/manifests/init.pp index dff3b1a4..00a7449c 100644 --- a/modules/kfreebsd/manifests/init.pp +++ b/modules/kfreebsd/manifests/init.pp @@ -1,7 +1,7 @@ class kfreebsd { file { "/etc/cron.d/dsa-killruby": - source => [ "puppet:///kfreebsd/dsa-killruby" ], + source => [ "puppet:///modules/kfreebsd/dsa-killruby" ], ; } sysctl { diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp index 06f71a0a..5e8da8c8 100644 --- a/modules/monit/manifests/init.pp +++ b/modules/monit/manifests/init.pp @@ -42,14 +42,14 @@ class monit { ; "/etc/monit/monit.d/01puppet": - source => "puppet:///monit/puppet", + source => "puppet:///modules/monit/puppet", require => Package["monit"], notify => Exec["monit stop"], mode => 440 ; "/etc/monit/monit.d/00debian.org": - source => "puppet:///monit/debianorg", + source => "puppet:///modules/monit/debianorg", require => Package["monit"], notify => Exec["monit stop"], mode => 440 diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index e16e20f8..7393260e 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -6,16 +6,16 @@ class nagios::client inherits nagios { file { "/etc/default/nagios-nrpe-server": - source => [ "puppet:///nagios/per-host/$fqdn/default", - "puppet:///nagios/common/default" ], + source => [ "puppet:///modules/nagios/per-host/$fqdn/default", + "puppet:///modules/nagios/common/default" ], require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/default/nagios-nrpe": ensure => absent, notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.cfg": - source => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg", - "puppet:///nagios/common/nrpe.cfg" ], + source => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg", + "puppet:///modules/nagios/common/nrpe.cfg" ], require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d": @@ -27,13 +27,13 @@ class nagios::client inherits nagios { require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d/nrpe_dsa.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ], require => Package["dsa-nagios-checks"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/obsolete-packages-ignore": - source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore", - "puppet:///nagios/common/obsolete-packages-ignore" ], + source => [ "puppet:///modules/nagios/per-host/$fqdn/obsolete-packages-ignore", + "puppet:///modules/nagios/common/obsolete-packages-ignore" ], require => Package["dsa-nagios-checks"]; "/etc/nagios/obsolete-packages-ignore.d/hostspecific": diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp index 3ee3020d..6f90533c 100644 --- a/modules/nagios/manifests/server.pp +++ b/modules/nagios/manifests/server.pp @@ -8,16 +8,16 @@ class nagios::server inherits nagios::client { file { "/etc/nagios-plugins/config/local-dsa-checkcommands.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/cgi.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/cgi.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/nagios.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/nagios.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; @@ -27,48 +27,48 @@ class nagios::server inherits nagios::client { ensure => directory; "/etc/nagios3/puppetconf.d/contacts.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/generic-host.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/generic-service.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/timeperiods.cfg": - source => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-dependencies.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-hostgroups.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-hosts.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-servicegroups.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; "/etc/nagios3/puppetconf.d/auto-services.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg" ], require => Package["nagios3"], notify => Exec["nagios3 reload"]; diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp index d8155cdf..76cfe3c6 100644 --- a/modules/named/manifests/geodns.pp +++ b/modules/named/manifests/geodns.pp @@ -12,16 +12,16 @@ class named::geodns inherits named { notify => Exec["apt-get update"], ; "/etc/bind/named.conf.local": - source => [ "puppet:///named/per-host/$fqdn/named.conf.local", - "puppet:///named/common/named.conf.local" ], + source => [ "puppet:///modules/named/per-host/$fqdn/named.conf.local", + "puppet:///modules/named/common/named.conf.local" ], require => Package["bind9"], notify => Exec["bind9 restart"], owner => root, group => root, ; "/etc/bind/named.conf.acl": - source => [ "puppet:///named/per-host/$fqdn/named.conf.acl", - "puppet:///named/common/named.conf.acl" ], + source => [ "puppet:///modules/named/per-host/$fqdn/named.conf.acl", + "puppet:///modules/named/common/named.conf.acl" ], require => Package["bind9"], notify => Exec["bind9 restart"], owner => root, @@ -40,30 +40,30 @@ class named::geodns inherits named { mode => 755, ; "/etc/bind/geodns/named.conf.geo": - source => [ "puppet:///named/per-host/$fqdn/named.conf.geo", - "puppet:///named/common/named.conf.geo" ], + source => [ "puppet:///modules/named/per-host/$fqdn/named.conf.geo", + "puppet:///modules/named/common/named.conf.geo" ], require => Package["bind9"], notify => Exec["bind9 restart"], owner => root, group => root, ; "/etc/bind/geodns/trigger": - source => [ "puppet:///named/per-host/$fqdn/trigger", - "puppet:///named/common/trigger" ], + source => [ "puppet:///modules/named/per-host/$fqdn/trigger", + "puppet:///modules/named/common/trigger" ], owner => root, group => root, mode => 555, ; "/etc/ssh/userkeys/geodnssync": - source => [ "puppet:///named/per-host/$fqdn/authorized_keys", - "puppet:///named/common/authorized_keys" ], + source => [ "puppet:///modules/named/per-host/$fqdn/authorized_keys", + "puppet:///modules/named/common/authorized_keys" ], owner => root, group => geodnssync, mode => 440, ; "/etc/cron.d/dsa-boot-geodnssync": - source => [ "puppet:///named/per-host/$fqdn/cron-geo", - "puppet:///named/common/cron-geo" ], + source => [ "puppet:///modules/named/per-host/$fqdn/cron-geo", + "puppet:///modules/named/common/cron-geo" ], owner => root, group => root, ; diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp index b0868525..4f0494e2 100644 --- a/modules/named/manifests/secondary.pp +++ b/modules/named/manifests/secondary.pp @@ -1,8 +1,8 @@ class named::secondary inherits named { file { "/etc/bind/named.conf.debian-zones": - source => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones", - "puppet:///named/common/named.conf.debian-zones" ], + source => [ "puppet:///modules/named/per-host/$fqdn/named.conf.debian-zones", + "puppet:///modules/named/common/named.conf.debian-zones" ], notify => Exec["bind9 reload"]; "/etc/bind/named.conf.options": content => template("named/named.conf.options.erb"), diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs-server/manifests/init.pp index 9a2b92ff..d14a6ca3 100644 --- a/modules/nfs-server/manifests/init.pp +++ b/modules/nfs-server/manifests/init.pp @@ -9,15 +9,15 @@ class nfs-server { file { "/etc/default/nfs-common": - source => "puppet:///nfs-server/nfs-common.default", + source => "puppet:///modules/nfs-server/nfs-common.default", require => Package["nfs-common"], notify => Exec["nfs-common restart"]; "/etc/default/nfs-kernel-server": - source => "puppet:///nfs-server/nfs-kernel-server.default", + source => "puppet:///modules/nfs-server/nfs-kernel-server.default", require => Package["nfs-kernel-server"], notify => Exec["nfs-kernel-server restart"]; "/etc/modprobe.d/lockd.local": - source => "puppet:///nfs-server/lockd.local.modprobe"; + source => "puppet:///modules/nfs-server/lockd.local.modprobe"; } exec { diff --git a/modules/postgrey/manifests/init.pp b/modules/postgrey/manifests/init.pp index 227655d3..678665ee 100644 --- a/modules/postgrey/manifests/init.pp +++ b/modules/postgrey/manifests/init.pp @@ -3,7 +3,7 @@ class postgrey { file { "/etc/default/postgrey": - source => "puppet:///postgrey/default", + source => "puppet:///modules/postgrey/default", require => Package["postgrey"], notify => Exec["postgrey restart"] ; diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp index 98add738..271c8bdf 100644 --- a/modules/ssh/manifests/init.pp +++ b/modules/ssh/manifests/init.pp @@ -5,7 +5,7 @@ class ssh { } file { "/etc/ssh/ssh_config": - source => [ "puppet:///ssh/ssh_config" ], + source => [ "puppet:///modules/ssh/ssh_config" ], require => Package["openssh-client"] ; "/etc/ssh/sshd_config": diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp index 81bdb893..391da0a4 100644 --- a/modules/ssl/manifests/init.pp +++ b/modules/ssl/manifests/init.pp @@ -32,19 +32,19 @@ class ssl { source => "puppet:///files/empty/" ; "/etc/ssl/debian/certs/thishost.crt": - source => "puppet:///ssl/clientcerts/$fqdn.client.crt", + source => "puppet:///modules/ssl/clientcerts/$fqdn.client.crt", notify => Exec["c_rehash /etc/ssl/debian/certs"], ; "/etc/ssl/debian/keys/thishost.key": - source => "puppet:///ssl/clientcerts/$fqdn.key", + source => "puppet:///modules/ssl/clientcerts/$fqdn.key", mode => 640 ; "/etc/ssl/debian/certs/ca.crt": - source => "puppet:///ssl/clientcerts/ca.crt", + source => "puppet:///modules/ssl/clientcerts/ca.crt", notify => Exec["c_rehash /etc/ssl/debian/certs"], ; "/etc/ssl/debian/crls/ca.crl": - source => "puppet:///ssl/clientcerts/ca.crl", + source => "puppet:///modules/ssl/clientcerts/ca.crl", ; } diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp index a3903573..d774a8f6 100644 --- a/modules/sudo/manifests/init.pp +++ b/modules/sudo/manifests/init.pp @@ -5,13 +5,13 @@ class sudo { owner => root, group => root, mode => 440, - source => [ "puppet:///sudo/per-host/$fqdn/sudoers", - "puppet:///sudo/common/sudoers" ], + source => [ "puppet:///modules/sudo/per-host/$fqdn/sudoers", + "puppet:///modules/sudo/common/sudoers" ], require => Package["sudo"] ; "/etc/pam.d/sudo": - source => [ "puppet:///sudo/per-host/$fqdn/pam", - "puppet:///sudo/common/pam" ], + source => [ "puppet:///modules/sudo/per-host/$fqdn/pam", + "puppet:///modules/sudo/common/pam" ], require => Package["sudo"] ;