Moving site-nodo

diff --git a/manifests/subsystems/gdm.pp b/manifests/subsystems/gdm.pp
index 403fd25afc4db17f9616286f19a89b8c0acea640..c7cb0acc6a4d51d69c2fbc3edcb4656f5e5414cc 100644 (file)
--- a/manifests/subsystems/gdm.pp
+++ b/manifests/subsystems/gdm.pp
@@ -21,7 +21,7 @@ class gdm {
     owner  => root,
     group  => root,
     mode   => 0644,
-    source => [ "puppet:///modules/site-nodo/etc/gdm/$domain/gdm.conf",
+    source => [ "puppet:///modules/site_nodo/etc/gdm/$domain/gdm.conf",
                 "puppet:///modules/nodo/etc/gdm/gdm.conf", ]
   }
 

diff --git a/manifests/subsystems/hosts.pp b/manifests/subsystems/hosts.pp
index be3d405c65d7038a276094d4bf3d748a0cb12ee0..e1833eae671e4365379cb43322d28770c025f61e 100644 (file)
--- a/manifests/subsystems/hosts.pp
+++ b/manifests/subsystems/hosts.pp
@@ -8,7 +8,7 @@ class hosts {
         owner  => root,
         group  => root,
         mode   => 0640,
-        source => "puppet:///modules/site-nodo/hosts/$fqdn",
+        source => "puppet:///modules/site_nodo/hosts/$fqdn",
       }
     }
     default: {

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

diff --git a/manifests/subsystems/mount.pp b/manifests/subsystems/mount.pp
index 7e2f4b6df35962cd9d85624a81fdb09453040e0c..3fcee58315b222bfad20861428fb4f76ad3aba81 100644 (file)
--- a/manifests/subsystems/mount.pp
+++ b/manifests/subsystems/mount.pp
@@ -2,9 +2,9 @@ class mount {
   class { autofs: }
 
   file { '/etc/auto.removable':
-    source => [ "puppet:///modules/site-nodo/etc/${::fqdn}/auto.removable",
-                "puppet:///modules/site-nodo/etc/${::domain}/auto.removable",
-                "puppet:///modules/site-nodo/etc/auto.removable",
+    source => [ "puppet:///modules/site_nodo/etc/${::fqdn}/auto.removable",
+                "puppet:///modules/site_nodo/etc/${::domain}/auto.removable",
+                "puppet:///modules/site_nodo/etc/auto.removable",
                 "puppet:///modules/nodo/etc/auto.removable.${::operatingssystem}",
                 "puppet:///modules/nodo/etc/auto.removable" ],
     notify => Service[autofs],

diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index 806fa602825c8014fbe8b4691e3c2da66209c053..2e75ddd93ec6c8929fed0120db9dcf2c7a0d2e92 100644 (file)
--- a/manifests/subsystems/pam.pp
+++ b/manifests/subsystems/pam.pp
@@ -26,8 +26,8 @@ class pam {
       owner   => root,
       group   => root,
       mode    => 0644,
-      source  => [ "puppet:///modules/site-nodo/security/pam_mount.conf.xml.$lsbdistcodename",
-                   "puppet:///modules/site-nodo/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/schroot.pp b/manifests/subsystems/schroot.pp
index 1795047c91de618f89dc2a91a983bb706d1dc6b5..950cc88701947912a36b26eb636d1de8f787ddc7 100644 (file)
--- a/manifests/subsystems/schroot.pp
+++ b/manifests/subsystems/schroot.pp
@@ -9,7 +9,7 @@ class schroot {
     group   => root,
     mode    => 0644,
     require => Package['schroot'],
-    source  => [ "puppet:///modules/site-nodo/etc/schroot/default/$fqdn/fstab",
+    source  => [ "puppet:///modules/site_nodo/etc/schroot/default/$fqdn/fstab",
                  "puppet:///modules/nodo/etc/schroot/default/fstab" ]
   }
 

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

diff --git a/manifests/subsystems/xorg.pp b/manifests/subsystems/xorg.pp
index bbdcb4836f7e2d1e4450d6533e08ef562734fd43..0d92cec498833a153ebee88bbcace6fb1f76b9f2 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:///modules/site-nodo/X11/xorg.conf/$hostname",
-                   "puppet:///modules/site-nodo/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/instance.pp b/manifests/vserver/instance.pp
index c2ad6e9c23eed81bd590780ad3808c2b96e2b680..9e2f0a57519386ed3fec41cbfe3a94708a99289a 100644 (file)
--- a/manifests/vserver/instance.pp
+++ b/manifests/vserver/instance.pp
@@ -41,7 +41,7 @@ define vserver::instance($context, $ensure = 'running', $proxy = false,
   # 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:///modules/site-nodo/etc/fstab/vserver/$name",
+    source  => [ "puppet:///modules/site_nodo/etc/fstab/vserver/$name",
                  "puppet:///modules/nodo/etc/fstab/vserver" ],
     owner   => "root",
     group   => "root",