aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-17 00:30:21 +0000
committerMichael Scherer <misc@mageia.org>2012-03-17 00:30:21 +0000
commit0d997b57ee84ea4cde13f00dc854dcdd8d895f68 (patch)
tree990b3b1240d6946e4dab4b51577ee195a1f147c8 /manifests
parent6e741965325ba3a09275d9e67577945582d7341f (diff)
downloadpuppet-0d997b57ee84ea4cde13f00dc854dcdd8d895f68.tar
puppet-0d997b57ee84ea4cde13f00dc854dcdd8d895f68.tar.gz
puppet-0d997b57ee84ea4cde13f00dc854dcdd8d895f68.tar.bz2
puppet-0d997b57ee84ea4cde13f00dc854dcdd8d895f68.tar.xz
puppet-0d997b57ee84ea4cde13f00dc854dcdd8d895f68.zip
various puppet-lint and scoping related fixes
Diffstat (limited to 'manifests')
-rw-r--r--manifests/nodes/valstar.pp26
1 files changed, 12 insertions, 14 deletions
diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp
index 1034ee77..f51e4cf6 100644
--- a/manifests/nodes/valstar.pp
+++ b/manifests/nodes/valstar.pp
@@ -7,7 +7,7 @@ node valstar {
# - setup maintainers database (with web interface)
#
include common::default_mageia_server
- timezone::timezone { "Europe/Paris": }
+ timezone::timezone { 'Europe/Paris': }
include main_mirror
include openldap::master
include subversion::client
@@ -33,7 +33,7 @@ node valstar {
include restrictshell::allow_upload_bin
# disabled the ldap key here instead of disabling for the
# whole module ( see r698 )
- class { "openssh::ssh_keys_from_ldap":
+ class { 'openssh::ssh_keys_from_ldap':
symlink_users => ['schedbot', 'iurt']
}
@@ -45,26 +45,24 @@ node valstar {
include websites::svn
- subversion::snapshot { "/etc/puppet":
- source => "svn://svn.mageia.org/svn/adm/puppet/"
+ subversion::snapshot { '/etc/puppet':
+ source => 'svn://svn.mageia.org/svn/adm/puppet/'
}
- mirror_cleaner::orphans { "cauldron":
- base => "/distrib/bootstrap/distrib/",
+ mirror_cleaner::orphans { 'cauldron':
+ base => '/distrib/bootstrap/distrib/',
}
# TODO use a dns zone for that
host { 'arm1':
- ip => '10.10.10.11',
- host_aliases => [ "arm1.$domain" ],
- ensure => present,
+ ip => '10.10.10.11',
+ host_aliases => [ "arm1.$::domain" ],
+ ensure => present,
}
host { 'arm2':
- ip => '10.10.10.12',
- host_aliases => [ "arm2.$domain" ],
- ensure => present,
+ ip => '10.10.10.12',
+ host_aliases => [ "arm2.$::domain" ],
+ ensure => present,
}
-
-
}