tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed "unquoted file mode" errors given by puppet-lint.

Browse source
This commit is contained in:
Timo Mkinen 2012-03-27 16:10:01 +03:00
parent 17341ec85c
commit 84edcd61ed
64 changed files with 512 additions and 512 deletions
Download patch file Download diff file Expand all files Collapse all files

38
apache/manifests/debian.pp
View file

@ -14,7 +14,7 @@ class apache::debian::common {
"/etc/apache2/conf.d",
"/etc/apache2/sites-enabled", ]:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
require => Package["httpd"],
@ -31,7 +31,7 @@ class apache::debian::common {
file { "/etc/apache2/envvars":
ensure => present,
content => template("apache/apache2.envvars.erb"),
mode => 0644,
mode => "0644",
owner => root,
group => root,
before => File["/etc/apache2/apache2.conf"],
@ -42,7 +42,7 @@ class apache::debian::common {
file { "/etc/apache2/httpd.conf":
ensure => present,
content => template("apache/apache2.httpd.conf.erb"),
mode => 0644,
mode => "0644",
owner => root,
group => root,
before => File["/etc/apache2/apache2.conf"],
@ -53,7 +53,7 @@ class apache::debian::common {
file { "/etc/apache2/ports.conf":
ensure => present,
content => "# HTTP server disabled\n",
mode => 0644,
mode => "0644",
owner => root,
group => root,
before => File["/etc/apache2/apache2.conf"],
@ -64,7 +64,7 @@ class apache::debian::common {
file { "/etc/apache2/apache2.conf":
ensure => present,
content => template("apache/apache2.conf.erb"),
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],
@ -109,7 +109,7 @@ define apache::debian::site($aliases, $root, $redirect) {
} else {
file { "/srv/www/http/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => File[$site_conf],
@ -118,7 +118,7 @@ define apache::debian::site($aliases, $root, $redirect) {
file { "/srv/www/log/http/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => File[$site_conf],
@ -128,7 +128,7 @@ define apache::debian::site($aliases, $root, $redirect) {
file { $site_conf:
ensure => present,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],
@ -144,7 +144,7 @@ define apache::debian::site($aliases, $root, $redirect) {
}
file { $site_confdir:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
purge => true,
@ -168,7 +168,7 @@ class apache::debian::sslserver inherits apache::debian::common {
"/srv/www/log/https",
"/srv/www/log/https/${homename}", ]:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
require => Package["httpd"],
@ -196,7 +196,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
} else {
file { "/srv/www/https/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => Service["apache2"],
@ -205,7 +205,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/srv/www/log/https/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => Service["apache2"],
@ -221,7 +221,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/etc/ssl/certs/${site_fqdn}.crt":
ensure => present,
source => $real_ssl_cert,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],
@ -236,7 +236,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/etc/ssl/private/${site_fqdn}.key":
ensure => present,
source => $real_ssl_key,
mode => 0600,
mode => "0600",
owner => root,
group => root,
notify => Service["apache2"],
@ -246,7 +246,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/etc/ssl/certs/${site_fqdn}.chain.crt":
ensure => present,
source => $ssl_chain,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],
@ -259,7 +259,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { $site_conf:
ensure => present,
content => template("apache/site.https.conf.erb"),
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],
@ -269,7 +269,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { $site_confdir:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
purge => true,
@ -288,7 +288,7 @@ define apache::debian::configfile($source, $content, $http, $https) {
file { "/etc/apache2/conf.d/${name}":
ensure => present,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],
@ -334,7 +334,7 @@ define apache::debian::a2enmod($source="", $content="") {
if $source or $content {
file { "/etc/apache2/mods-available/${name}.conf":
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["apache2"],

18
apache/manifests/init.pp
View file

@ -23,7 +23,7 @@ class apache::common {
if $apache_datadir {
file { $apache_datadir:
ensure => directory,
mode => 0755,
mode => "0755",
owner => "root",
group => "root",
seltype => "httpd_sys_content_t",
@ -37,7 +37,7 @@ class apache::common {
} else {
file { "/srv/www":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
}
@ -45,7 +45,7 @@ class apache::common {
file { "/srv/www/log":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
require => File["/srv/www"],
@ -72,7 +72,7 @@ class apache::common {
file { "/usr/local/sbin/www-logrotate.sh":
ensure => present,
source => "puppet:///modules/apache/www-logrotate.sh",
mode => 0755,
mode => "0755",
owner => root,
group => root,
seluser => "system_u",
@ -697,7 +697,7 @@ class apache::webalizer {
"/srv/www/webalizer/html/https",
"/srv/www/webalizer/html", ]:
ensure => directory,
mode => 0755,
mode => "0755",
owner => $operatingsystem ? {
debian => root,
ubuntu => root,
@ -711,7 +711,7 @@ class apache::webalizer {
"/etc/webalizer/http",
"/etc/webalizer/https", ]:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
}
@ -741,7 +741,7 @@ class apache::webalizer {
file { "/usr/local/sbin/www-webalizer.sh":
ensure => present,
source => "puppet:///modules/apache/www-webalizer.sh",
mode => 0755,
mode => "0755",
owner => root,
group => root,
require => Package["webalizer"],
@ -770,7 +770,7 @@ define apache::webalizer::site($site_proto, $site_fqdn) {
@file { "/etc/webalizer/${name}.conf":
ensure => present,
mode => 0644,
mode => "0644",
owner => root,
group => root,
content => template("apache/webalizer.conf.erb"),
@ -781,7 +781,7 @@ define apache::webalizer::site($site_proto, $site_fqdn) {
@file { [ "/srv/www/webalizer/history/${name}",
"/srv/www/webalizer/html/${name}", ]:
ensure => directory,
mode => 0755,
mode => "0755",
owner => $operatingsystem ? {
debian => root,
ubuntu => root,

36
apache/manifests/redhat.pp
View file

@ -7,7 +7,7 @@ class apache::redhat::server {
"/srv/www/log/http",
"/srv/www/log/http/${homename}", ]:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
require => Package["httpd"],
@ -24,7 +24,7 @@ class apache::redhat::server {
file { "/etc/httpd/conf/httpd.conf":
ensure => present,
content => template("apache/httpd.conf.erb"),
mode => 0644,
mode => "0644",
owner => root,
group => root,
require => Package["httpd"],
@ -62,7 +62,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
} else {
file { "/srv/www/http/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => File[$site_conf],
@ -71,7 +71,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
file { "/srv/www/log/http/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => File[$site_conf],
@ -81,7 +81,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
file { $site_conf:
ensure => present,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["httpd"],
@ -97,7 +97,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
}
file { $site_confdir:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
purge => true,
@ -126,7 +126,7 @@ class apache::redhat::sslserver {
"/srv/www/log/https",
"/srv/www/log/https/${homename}", ]:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
require => Package["httpd"],
@ -142,7 +142,7 @@ class apache::redhat::sslserver {
file { "/etc/httpd/conf/httpsd.conf":
ensure => present,
mode => 0644,
mode => "0644",
owner => root,
group => root,
content => template("apache/httpsd.conf.erb"),
@ -153,7 +153,7 @@ class apache::redhat::sslserver {
file { "/etc/init.d/httpsd":
ensure => present,
source => "puppet:///modules/apache/httpsd",
mode => 0755,
mode => "0755",
owner => root,
group => root,
}
@ -197,7 +197,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
} else {
file { "/srv/www/https/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => Service["httpsd"],
@ -206,7 +206,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/srv/www/log/https/${site_fqdn}":
ensure => directory,
mode => 0755,
mode => "0755",
owner => root,
group => root,
before => Service["httpsd"],
@ -222,7 +222,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/etc/pki/tls/certs/${site_fqdn}.crt":
ensure => present,
source => $real_ssl_cert,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["httpsd"],
@ -237,7 +237,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/etc/pki/tls/private/${site_fqdn}.key":
ensure => present,
source => $real_ssl_key,
mode => 0600,
mode => "0600",
owner => root,
group => root,
notify => Service["httpsd"],
@ -247,7 +247,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { "/etc/pki/tls/certs/${site_fqdn}.chain.crt":
ensure => present,
source => $ssl_chain,
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["httpsd"],
@ -260,7 +260,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { $site_conf:
ensure => present,
content => template("apache/site.https.conf.erb"),
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["httpsd"],
@ -270,7 +270,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
file { $site_confdir:
ensure => directory,
mode => 0644,
mode => "0644",
owner => root,
group => root,
purge => true,
@ -293,7 +293,7 @@ define apache::redhat::configfile($source, $content, $http, $https) {
true => present,
default => absent,
},
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["httpd"],
@ -326,7 +326,7 @@ define apache::redhat::configfile($source, $content, $http, $https) {
true => present,
default => absent,
},
mode => 0644,
mode => "0644",
owner => root,
group => root,
notify => Service["httpsd"],