Updating to site-module convention

diff --git a/manifests/subsystems/locales.pp b/manifests/subsystems/locales.pp
index 90bd96cf9cd1601a41491a0eef0f4af9b0792590..dd01a24d2ca17a828ce40e0cd7d8b0517cea7da5 100644 (file)
--- a/manifests/subsystems/locales.pp
+++ b/manifests/subsystems/locales.pp
@@ -4,8 +4,8 @@ class locales {
   }
 
   file { "/etc/default/locale":
-    source  => [ "puppet://$server/files/etc/default/locale",
-                 "puppet://$server/modules/nodo/etc/default/locale" ],
+    source  => [ "puppet:///modules/site-nodo/etc/default/locale",
+                 "puppet:///modules/nodo/etc/default/locale" ],
     ensure => present,
     owner  => root,
     group  => root,
@@ -13,8 +13,8 @@ class locales {
   }
 
   file { "/etc/locale.gen":
-    source  => [ "puppet://$server/files/etc/locale.gen",
-                 "puppet://$server/modules/nodo/etc/locale.gen" ],
+    source  => [ "puppet:///modules/site-nodo/etc/locale.gen",
+                 "puppet:///modules/nodo/etc/locale.gen" ],
     ensure => present,
     owner  => root,
     group  => root,

diff --git a/manifests/subsystems/modprobe.pp b/manifests/subsystems/modprobe.pp
index 176efb5923adfe201bd0491eb4f2e3e98183c0af..2b75225c813a2b8ca4245b25689999f20e07b366 100644 (file)
--- a/manifests/subsystems/modprobe.pp
+++ b/manifests/subsystems/modprobe.pp
@@ -7,7 +7,7 @@ class modprobe {
         group   => "root",
         mode    => 0644,
         ensure  => present,
-        source  => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist.conf",
+        source  => "puppet:///modules/nodo/etc/modprobe.d/blacklist.conf",
       }
     }
     default: {
@@ -21,7 +21,7 @@ class modprobe {
         group   => "root",
         mode    => 0644,
         ensure  => present,
-        source  => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist.conf",
+        source  => "puppet:///modules/nodo/etc/modprobe.d/blacklist.conf",
       }
     }
   }
@@ -33,7 +33,7 @@ class modprobe::laptop {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    source  => "puppet://$server/modules/nodo/etc/modules/laptop",
+    source  => "puppet:///modules/nodo/etc/modules/laptop",
   }
 
   # see http://wiki.debian.org/DebianAcerOne#Cardreader
@@ -42,6 +42,6 @@ class modprobe::laptop {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    source  => "puppet://$server/modules/nodo/etc/modprobe.d/aspire-blacklist-memstick.conf",
+    source  => "puppet:///modules/nodo/etc/modprobe.d/aspire-blacklist-memstick.conf",
   }
 }

diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index 7e96321e1fc01d898a32ff2fcf046a433d3095ef..806fa602825c8014fbe8b4691e3c2da66209c053 100644 (file)
--- a/manifests/subsystems/pam.pp
+++ b/manifests/subsystems/pam.pp
@@ -2,8 +2,8 @@ class pam {
   if $pam != false {
     # pam - login
     file { "/etc/pam.d/login":
-      source  => [ "puppet://$server/modules/nodo/etc/pam.d/login.${lsbdistcodename}",
-                   "puppet://$server/modules/nodo/etc/pam.d/login",
+      source  => [ "puppet:///modules/nodo/etc/pam.d/login.${lsbdistcodename}",
+                   "puppet:///modules/nodo/etc/pam.d/login",
                  ],
       owner   => "root",
       group   => "root",
@@ -13,7 +13,7 @@ class pam {
 
     # pam - gdm
     file { "/etc/pam.d/gdm":
-      source  => "puppet://$server/modules/nodo/etc/pam.d/gdm",
+      source  => "puppet:///modules/nodo/etc/pam.d/gdm",
       owner   => "root",
       group   => "root",
       mode    => 0644,
@@ -26,8 +26,8 @@ class pam {
       owner   => root,
       group   => root,
       mode    => 0644,
-      source  => [ "puppet://$server/files/etc/security/pam_mount.conf.xml.$lsbdistcodename",
-                   "puppet://$server/files/etc/security/pam_mount.conf.xml",
+      source  => [ "puppet:///modules/site-nodo/security/pam_mount.conf.xml.$lsbdistcodename",
+                   "puppet:///modules/site-nodo/security/pam_mount.conf.xml",
                  ],
     }
   }

diff --git a/manifests/subsystems/sudo.pp b/manifests/subsystems/sudo.pp
index 3b377ed53ab2a1f280d49184d15887dad2e27701..88f45a1230816162507b8fdf53a138f9dd477af3 100644 (file)
--- a/manifests/subsystems/sudo.pp
+++ b/manifests/subsystems/sudo.pp
@@ -5,8 +5,8 @@ class sudo {
   }
 
   file { "/etc/sudoers":
-    source  => [ "puppet://$server/files/etc/sudoers/$hostname",
-                 "puppet://$server/modules/nodo/etc/sudoers" ],
+    source  => [ "puppet:///modules/site-nodo/etc/sudoers/$hostname",
+                 "puppet:///modules/nodo/etc/sudoers" ],
     owner   => "root",
     group   => "root",
     mode    => 440,

diff --git a/manifests/subsystems/tunnel.pp b/manifests/subsystems/tunnel.pp
index 52384f7d8f7bb2076ae766b7f63ccfab18a91275..a7781aaf035b10080c4c20a5503cdbfc2adec412 100644 (file)
--- a/manifests/subsystems/tunnel.pp
+++ b/manifests/subsystems/tunnel.pp
@@ -72,7 +72,7 @@ class tunnel {
         mode    => 0644,
         owner   => 0,
         group   => 0,
-        source  => "puppet://$server/files/keys/${user}_id_${keytype}.pub",
+        source  => "puppet:///modules/site-keys/${user}_id_${keytype}.pub",
         require => File["${ssh_dir}"],
         tag     => "$tag",
       }

diff --git a/manifests/subsystems/xorg.pp b/manifests/subsystems/xorg.pp
index 5c27bd86847455bda388fad4385482c63ab0cbfa..bbdcb4836f7e2d1e4450d6533e08ef562734fd43 100644 (file)
--- a/manifests/subsystems/xorg.pp
+++ b/manifests/subsystems/xorg.pp
@@ -6,8 +6,8 @@ class xorg {
       owner   => root,
       group   => root,
       mode    => 0644,
-      source  => [ "puppet://$server/files/etc/X11/xorg.conf/$hostname",
-                   "puppet://$server/files/etc/X11/xorg.conf.default" ],
+      source  => [ "puppet:///modules/site-nodo/X11/xorg.conf/$hostname",
+                   "puppet:///modules/site-nodo/X11/xorg.conf.default" ],
     }
   }
 }

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index b77871c88915b6cd4ca0487eb108a251eda51172..da37e6a75a81c216cd5aa2b10f12ecacb875941f 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -69,8 +69,8 @@ class nodo::vserver inherits nodo {
     # Some nodes need a lot of space at /tmp otherwise some admin
     # tasks like backups might not run.
     file { "/etc/vservers/${name}/fstab":
-      source  => [ "puppet://$server/files/etc/fstab/vserver/$name",
-                   "puppet://$server/modules/nodo/etc/fstab/vserver" ],
+      source  => [ "puppet:///modules/site-nodo/etc/fstab/vserver/$name",
+                   "puppet:///modules/nodo/etc/fstab/vserver" ],
       owner   => "root",
       group   => "root",
       mode    => 0644,
@@ -94,7 +94,7 @@ class nodo::vserver inherits nodo {
       if !defined(File["/usr/local/sbin/create-sound-devices"]) {
         file { "/usr/local/sbin/create-sound-devices":
           ensure => present,
-          source => "puppet://$server/modules/nodo/sound/devices.sh",
+          source => "puppet:///modules/nodo/sound/devices.sh",
           owner  => root,
           group  => root,
           mode   => 755,