summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-06-05 19:02:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-06-05 19:02:34 -0300
commit9007087fc0cebdda9d52c10df889438220f7c74d (patch)
treec5a6610832ad4809d8b207cdd55b9bb2fd1c357c
parentb23543c94e9f99d2949ae21ced407f0cc4493976 (diff)
downloadpuppet-apache-9007087fc0cebdda9d52c10df889438220f7c74d.tar.gz
puppet-apache-9007087fc0cebdda9d52c10df889438220f7c74d.tar.bz2
Changes for puppet 4 compatibility
-rw-r--r--manifests/envvars.pp2
-rw-r--r--manifests/init.pp20
-rw-r--r--manifests/site/config.pp4
-rw-r--r--manifests/site/manage.pp2
4 files changed, 14 insertions, 14 deletions
diff --git a/manifests/envvars.pp b/manifests/envvars.pp
index fb60d69..f2d2b8b 100644
--- a/manifests/envvars.pp
+++ b/manifests/envvars.pp
@@ -5,7 +5,7 @@ class apache::envvars(
ensure => present,
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
source => $source,
require => Package['apache'],
diff --git a/manifests/init.pp b/manifests/init.pp
index 96f6f08..bd1c639 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -66,7 +66,7 @@ class apache(
ensure => directory,
owner => root,
group => root,
- mode => 0755,
+ mode => '0755',
require => Package["apache"],
}
@@ -135,7 +135,7 @@ class apache(
content => template('apache/macros.erb'),
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
require => Module["macro"],
notify => Service["apache"],
}
@@ -146,7 +146,7 @@ class apache(
content => template("apache/apache2.conf.${::lsbdistcodename}.erb"),
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
}
@@ -156,7 +156,7 @@ class apache(
content => template('apache/alias.conf.erb'),
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
}
@@ -166,7 +166,7 @@ class apache(
content => template('apache/autoindex.conf.erb'),
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
}
@@ -174,7 +174,7 @@ class apache(
ensure => directory,
owner => "root",
group => "root",
- mode => 0755,
+ mode => '0755',
}
# icons folder
@@ -189,7 +189,7 @@ class apache(
owner => "root",
group => "root",
# This mode will also apply to files from the source directory
- mode => 0644,
+ mode => '0644',
# Puppet will automatically set +x for directories
source => [ "puppet:///modules/site_apache/htdocs/$domain/icons",
"puppet:///modules/apache/icons", ],
@@ -208,7 +208,7 @@ class apache(
content => template('apache/default.erb'),
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
}
@@ -232,7 +232,7 @@ class apache(
},
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
}
@@ -247,7 +247,7 @@ class apache(
content => "RequestHeader set REMOTE_ADDR ${remote_addr}\n",
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
notify => Service["apache"],
}
diff --git a/manifests/site/config.pp b/manifests/site/config.pp
index 6e6829f..5ad91af 100644
--- a/manifests/site/config.pp
+++ b/manifests/site/config.pp
@@ -31,7 +31,7 @@ define apache::site::config(
"puppet:///modules/site_apache/vhosts/${name}" ],
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
require => File["${apache::macros}"],
notify => Service["apache"],
}
@@ -42,7 +42,7 @@ define apache::site::config(
content => template("$template"),
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
require => File["${apache::macros}"],
notify => Service["apache"],
}
diff --git a/manifests/site/manage.pp b/manifests/site/manage.pp
index c04bec3..36e9934 100644
--- a/manifests/site/manage.pp
+++ b/manifests/site/manage.pp
@@ -14,7 +14,7 @@ define apache::site::manage(
ensure => present,
owner => $owner,
group => $group,
- mode => 0755,
+ mode => '0755',
recurse => false,
}
}