aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-07-14 15:37:00 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-07-14 15:37:00 -0300
commit38fb3669d0ecbfcd8438d2781869dc06a71a4541 (patch)
tree6cf7c22972441946a094302cdd5abf3aaab59e14
parent4eb8dfd32499625ceb60d06f3ebf236de727a3b0 (diff)
downloadpuppet-nodo-38fb3669d0ecbfcd8438d2781869dc06a71a4541.tar.gz
puppet-nodo-38fb3669d0ecbfcd8438d2781869dc06a71a4541.tar.bz2
Updating to site-module convention
-rw-r--r--manifests/subsystems/locales.pp8
-rw-r--r--manifests/subsystems/modprobe.pp8
-rw-r--r--manifests/subsystems/pam.pp10
-rw-r--r--manifests/subsystems/sudo.pp4
-rw-r--r--manifests/subsystems/tunnel.pp2
-rw-r--r--manifests/subsystems/xorg.pp4
-rw-r--r--manifests/vserver.pp6
7 files changed, 21 insertions, 21 deletions
diff --git a/manifests/subsystems/locales.pp b/manifests/subsystems/locales.pp
index 90bd96c..dd01a24 100644
--- 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 176efb5..2b75225 100644
--- 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 7e96321..806fa60 100644
--- 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 3b377ed..88f45a1 100644
--- 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 52384f7..a7781aa 100644
--- 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 5c27bd8..bbdcb48 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://$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 b77871c..da37e6a 100644
--- 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,