diff options
| -rw-r--r-- | manifests/subsystems/utils.pp | 4 | ||||
| -rw-r--r-- | manifests/subsystems/websites.pp | 14 | ||||
| -rw-r--r-- | manifests/subsystems/xorg.pp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp index ae21adb..9d0b8b4 100644 --- a/manifests/subsystems/utils.pp +++ b/manifests/subsystems/utils.pp @@ -22,12 +22,12 @@ class utils { # Ensure we have the minimum augeas version required by shorewall module package { 'libaugeas0': - ensure => $lsbdistcodename ? { + ensure => $::lsbdistcodename ? { 'squeeze' => '0.10.0-1~bpo60+3', default => installed, }; 'augeas-tools': - ensure => $lsbdistcodename ? { + ensure => $::lsbdistcodename ? { 'squeeze' => '0.10.0-1~bpo60+3', default => installed, }, diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp index 764ed97..ba5ed32 100644 --- a/manifests/subsystems/websites.pp +++ b/manifests/subsystems/websites.pp @@ -20,7 +20,7 @@ class websites::setup { # This mode will also apply to files from the source directory mode => 0644, # Puppet will automatically set +x for directories - source => [ "puppet:///modules/site_apache/htdocs/$domain/images", + source => [ "puppet:///modules/site_apache/htdocs/${::domain}/images", "puppet:///modules/nodo/htdocs/images", ] } @@ -30,7 +30,7 @@ class websites::setup { owner => "root", group => "root", mode => 0644, - source => [ "puppet:///modules/site_apache/htdocs/$domain/index.html", + source => [ "puppet:///modules/site_apache/htdocs/${::domain}/index.html", "puppet:///modules/nodo/htdocs/index.html", ] } @@ -40,7 +40,7 @@ class websites::setup { owner => "root", group => "root", mode => 0644, - source => [ "puppet:///modules/site_apache/htdocs/$domain/missing.html", + source => [ "puppet:///modules/site_apache/htdocs/${::domain}/missing.html", "puppet:///modules/nodo/htdocs/missing.html", ] } @@ -51,7 +51,7 @@ class websites::setup { # Default vhost: can just be applied on the defining host apache::site { "${apache::server_name}": - server_alias => "$domain", + server_alias => "${::domain}", docroot => "${apache::www_folder}", mpm => false, tag => 'all', @@ -114,17 +114,17 @@ class websites::hosting inherits websites::setup { } # Remove untagged site instances - Apache::Site <| tag != $hostname and tag != 'all' |> { + Apache::Site <| tag != $::hostname and tag != 'all' |> { ensure => absent, } # Remove untagged database instances - Database::Instance <| tag != $hostname and tag != 'all' |> { + Database::Instance <| tag != $::hostname and tag != 'all' |> { ensure => absent, } # Remove untagged ikiwiki instances - Ikiwiki::Instance <| tag != $hostname and tag != 'all' |> { + Ikiwiki::Instance <| tag != $::hostname and tag != 'all' |> { ensure => absent, } } diff --git a/manifests/subsystems/xorg.pp b/manifests/subsystems/xorg.pp index f90feff..7009707 100644 --- a/manifests/subsystems/xorg.pp +++ b/manifests/subsystems/xorg.pp @@ -5,8 +5,8 @@ class xorg($enable = hiera('nodo::xorg::enable', false)) { owner => root, group => root, mode => 0644, - source => [ "puppet:///modules/site_nodo/X11/xorg.conf/${hostname}.${lsbdistcodename}", - "puppet:///modules/site_nodo/X11/xorg.conf/${hostname}", + source => [ "puppet:///modules/site_nodo/X11/xorg.conf/${::hostname}.${::lsbdistcodename}", + "puppet:///modules/site_nodo/X11/xorg.conf/${::hostname}", "puppet:///modules/site_nodo/X11/xorg.conf.default" ], } } |