From 5b8827a1b5bbf04e17a31be00d8cdd599362c9d3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 19 Jan 2013 19:25:17 -0200 Subject: Moving site-nodo --- manifests/subsystems/gdm.pp | 2 +- manifests/subsystems/hosts.pp | 2 +- manifests/subsystems/locales.pp | 4 ++-- manifests/subsystems/mount.pp | 6 +++--- manifests/subsystems/pam.pp | 4 ++-- manifests/subsystems/schroot.pp | 2 +- manifests/subsystems/sudo.pp | 2 +- manifests/subsystems/xorg.pp | 4 ++-- manifests/vserver/instance.pp | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'manifests') diff --git a/manifests/subsystems/gdm.pp b/manifests/subsystems/gdm.pp index 403fd25..c7cb0ac 100644 --- 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 be3d405..e1833ea 100644 --- 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 dd01a24..f52f100 100644 --- 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 7e2f4b6..3fcee58 100644 --- 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 806fa60..2e75ddd 100644 --- 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 1795047..950cc88 100644 --- 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 88f45a1..c3e18e7 100644 --- 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 bbdcb48..0d92cec 100644 --- 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 c2ad6e9..9e2f0a5 100644 --- 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", -- cgit v1.2.3