From 8c967e8ff94380e18a59b5701ece7b5a98513b2d Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 20 Nov 2011 14:55:28 +0100 Subject: include php default dirs if we want to add subdirs --- manifests/defaultphpdirs.pp | 2 -- 1 file changed, 2 deletions(-) (limited to 'manifests/defaultphpdirs.pp') diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp index fdbe8a5..eba060a 100644 --- a/manifests/defaultphpdirs.pp +++ b/manifests/defaultphpdirs.pp @@ -1,5 +1,3 @@ -# manifests/defaultphpdirs.pp - class apache::defaultphpdirs { file{'/var/www/upload_tmp_dir': ensure => directory, -- cgit v1.2.3 From 8d61ad7c8a76adf378a319245d655cf0fce18d25 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 12 Feb 2012 15:43:28 +0100 Subject: manage selinux stuff --- manifests/defaultphpdirs.pp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'manifests/defaultphpdirs.pp') diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp index eba060a..e8b3e4e 100644 --- a/manifests/defaultphpdirs.pp +++ b/manifests/defaultphpdirs.pp @@ -1,12 +1,21 @@ class apache::defaultphpdirs { - file{'/var/www/upload_tmp_dir': + file{ + '/var/www/upload_tmp_dir': ensure => directory, require => Package['apache'], owner => root, group => 0, mode => 0755; - } - file{'/var/www/session.save_path': + '/var/www/session.save_path': ensure => directory, require => Package['apache'], owner => root, group => 0, mode => 0755; } + + if $::selinux != 'false' { + selinux::fcontext{ + ['/var/www/upload_tmp_dir/.+(/.*)?', + '/var/www/session.save_path/.+(/.*)?']: + setype => 'httpd_sys_rw_content_t', + before => File['/var/www/upload_tmp_dir','/var/www/session.save_path']; + } + } } -- cgit v1.2.3 From 6094ea451f4adf18c36bbef5cdb580aaf9b21542 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 21 Feb 2012 15:57:30 +0100 Subject: use correct selinux type --- manifests/defaultphpdirs.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/defaultphpdirs.pp') diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp index e8b3e4e..93f7f1f 100644 --- a/manifests/defaultphpdirs.pp +++ b/manifests/defaultphpdirs.pp @@ -14,7 +14,7 @@ class apache::defaultphpdirs { selinux::fcontext{ ['/var/www/upload_tmp_dir/.+(/.*)?', '/var/www/session.save_path/.+(/.*)?']: - setype => 'httpd_sys_rw_content_t', + setype => 'httpd_sys_script_rw_t', before => File['/var/www/upload_tmp_dir','/var/www/session.save_path']; } } -- cgit v1.2.3 From f4c092d2f027ce2a3492f1f4bad1c691b8d3d6e9 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 17 Mar 2013 00:37:04 +0100 Subject: linting --- manifests/defaultphpdirs.pp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'manifests/defaultphpdirs.pp') diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp index 93f7f1f..16561ac 100644 --- a/manifests/defaultphpdirs.pp +++ b/manifests/defaultphpdirs.pp @@ -1,21 +1,27 @@ +# setup some directories for php class apache::defaultphpdirs { file{ '/var/www/upload_tmp_dir': - ensure => directory, + ensure => directory, require => Package['apache'], - owner => root, group => 0, mode => 0755; + owner => root, + group => 0, + mode => '0755'; '/var/www/session.save_path': - ensure => directory, + ensure => directory, require => Package['apache'], - owner => root, group => 0, mode => 0755; + owner => root, + group => 0, + mode => '0755'; } if $::selinux != 'false' { selinux::fcontext{ - ['/var/www/upload_tmp_dir/.+(/.*)?', - '/var/www/session.save_path/.+(/.*)?']: - setype => 'httpd_sys_script_rw_t', - before => File['/var/www/upload_tmp_dir','/var/www/session.save_path']; + [ '/var/www/upload_tmp_dir/.+(/.*)?', + '/var/www/session.save_path/.+(/.*)?' ]: + require => Package['apache'], + setype => 'httpd_sys_script_rw_t', + before => File['/var/www/upload_tmp_dir','/var/www/session.save_path']; } } } -- cgit v1.2.3 From 00952a0b9a210c8df93e1b03f0f508c6087a16f9 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 17 Mar 2013 01:23:21 +0100 Subject: fix selttype on EL6 --- manifests/defaultphpdirs.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'manifests/defaultphpdirs.pp') diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp index 16561ac..5485241 100644 --- a/manifests/defaultphpdirs.pp +++ b/manifests/defaultphpdirs.pp @@ -16,11 +16,15 @@ class apache::defaultphpdirs { } if $::selinux != 'false' { + $seltype_rw = $::lsbmajdistrelease ? { + 5 => 'httpd_sys_script_rw_t', + default => 'httpd_sys_rw_content_t' + } selinux::fcontext{ [ '/var/www/upload_tmp_dir/.+(/.*)?', '/var/www/session.save_path/.+(/.*)?' ]: require => Package['apache'], - setype => 'httpd_sys_script_rw_t', + setype => $seltype_rw, before => File['/var/www/upload_tmp_dir','/var/www/session.save_path']; } } -- cgit v1.2.3