summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/site.pp2
m---------puppet/modules/apache0
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp14
3 files changed, 9 insertions, 7 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 22172584..9e3d0232 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -4,7 +4,7 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
$custom_key_dir = 'puppet:///modules/site_apt/keys'
# parse services for host
-$services=hiera_array('services')
+$services=join(hiera_array('services'), ' ')
notice("Services for ${fqdn}: ${services}")
# make sure apt is updated before any packages are installed
diff --git a/puppet/modules/apache b/puppet/modules/apache
-Subproject 090e59ad1fcba01e868237a83cadf9254cf09d3
+Subproject c3e92a9b3cb02f1546b6b1570f10a968d380005
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 1e1590f5..83a1040d 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -1,11 +1,11 @@
class site_config::hosts() {
- $hosts = hiera('hosts','')
- $hostname = hiera('name')
- $domain_hash = hiera('domain')
+ $hosts = hiera('hosts','')
+ $hostname = hiera('name')
+ $domain_hash = hiera('domain')
$domain_public = $domain_hash['full_suffix']
- file { "/etc/hostname":
- ensure => present,
+ file { '/etc/hostname':
+ ensure => present,
content => $hostname
}
@@ -16,6 +16,8 @@ class site_config::hosts() {
file { '/etc/hosts':
content => template('site_config/hosts'),
- mode => '0644', owner => root, group => root;
+ mode => '0644',
+ owner => root,
+ group => root;
}
}