From 1c46f1634da0b5aff98d8385d324a8e236f5ca5f Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 20 Apr 2018 10:32:45 +0200 Subject: [PATCH 1/2] adds empty index.html --- manifests/params.pp | 2 ++ manifests/server/files.pp | 17 +++++++++++++++++ templates/index_html.erb | 0 3 files changed, 19 insertions(+) create mode 100644 templates/index_html.erb diff --git a/manifests/params.pp b/manifests/params.pp index 62ea1c6..4f38534 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -116,6 +116,8 @@ $ae_autoindex_file = "${ae_conf_d_dir}/autoindex.conf" $ae_autoindex_erb = 'cd_apache/autoindex_conf.erb' $ae_userdir_file = "${ae_conf_d_dir}/userdir.conf" $ae_userdir_erb = 'cd_apache/userdir_conf.erb' +$ae_index_file = '/var/www/html/index.html' +$ae_index_erb = 'cd_apache/index_html.erb' # includes must be last diff --git a/manifests/server/files.pp b/manifests/server/files.pp index e8cd667..d2915cb 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -93,6 +93,23 @@ class cd_apache::server::files ( notify => Service['httpd'], } + # manage index.html + + file { $ae_index_file: + ensure => file, + path => $ae_index_file, + owner => $ae_user_name, + group => $ae_user_name, + mode => '0644', + selrange => s0, + selrole => object_r, + seltype => httpd_sys_content_t, + seluser => system_u, + content => template($ae_index_erb), + notify => Service['httpd'], + } + + if $ae_allow_user_dirs == true { # manage userdir.conf diff --git a/templates/index_html.erb b/templates/index_html.erb new file mode 100644 index 0000000..e69de29 From 3e4c6a15e5f84400e385ae22e6e0093ade0fee80 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Fri, 20 Apr 2018 10:32:51 +0200 Subject: [PATCH 2/2] recommit for updates in build 5 --- CHANGELOG.md | 131 ++++++++++-------- REPOSTRUCTURE.md | 4 +- doc/puppet_classes/cd_apache_3A_3Aparams.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Afiles.html | 36 ++++- tests/UTF_Files | 1 + 5 files changed, 117 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48001be..9a4c43c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,29 +8,44 @@ Changelog of Git Changelog.

No issue

+0ea5a3a76907b09 Jenkins ConfDroid 2018-04-20 08:06:28 +

+

recommit for updates in build 4

+ +

921eeddd761dc4c Jenkins ConfDroid 2018-04-10 11:21:33

recommit for updates in build 3

-

-1118729c9640ecb Arne Teuke 2018-04-10 11:20:56 -

-

updates README

-

62260e329bcf99e Jenkins ConfDroid 2018-04-10 11:06:02

recommit for updates in build 2

-84ca8d72b971661 Arne Teuke 2018-04-10 11:05:24 +406a049bcef19c7 Jenkins ConfDroid 2018-04-10 10:56:53 +

+

recommit for updates in build 1

+ +

+ +

0.0.1.8

+

No issue

+ + +e68298bc5c126fc Arne Teuke 2018-04-20 08:06:12 +

+

adds nagios target

+ +

+1118729c9640ecb Arne Teuke 2018-04-10 11:20:56

updates README

-406a049bcef19c7 Jenkins ConfDroid 2018-04-10 10:56:53 +84ca8d72b971661 Arne Teuke 2018-04-10 11:05:24

-

recommit for updates in build 1

+

updates README

5009ae57d917323 Arne Teuke 2018-04-10 10:56:10 @@ -57,61 +72,11 @@ Changelog of Git Changelog.

recommit for updates in build 14

-

- -

v0.0.1.7

-

No issue

- - -4296733d3e34a37 Arne Teuke 2017-07-11 17:26:50 -

-

more improved testing

- -

-387ab193a95da9e Arne Teuke 2017-07-11 17:24:39 -

-

more improved testing

- -

- -

v0.0.1.6

-

No issue

- - -eacdc6522bc654c Arne Teuke 2017-07-11 17:14:21 -

-

updated README

- -

-08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 -

-

finalised this stage

- -

-19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45 -

-

finalised this stage

-

834532297866d17 Arne Teuke 2017-07-11 17:01:19

added one more step

-

- -

v0.0.1.4

-

No issue

- - -114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22 -

-

removed stale FileList

- -

-7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04 -

-

updated README and version

-

3764f0bef1450d2 Jenkins Server 2017-07-11 16:53:37

@@ -164,6 +129,56 @@ Changelog of Git Changelog.

+

v0.0.1.7

+

No issue

+ + +4296733d3e34a37 Arne Teuke 2017-07-11 17:26:50 +

+

more improved testing

+ +

+387ab193a95da9e Arne Teuke 2017-07-11 17:24:39 +

+

more improved testing

+ +

+ +

v0.0.1.6

+

No issue

+ + +eacdc6522bc654c Arne Teuke 2017-07-11 17:14:21 +

+

updated README

+ +

+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 +

+

finalised this stage

+ +

+19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45 +

+

finalised this stage

+ +

+ +

v0.0.1.4

+

No issue

+ + +114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22 +

+

removed stale FileList

+ +

+7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04 +

+

updated README and version

+ +

+

v0.0.1.3

No issue

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 09f43e7..70355aa 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -10,6 +10,7 @@ | | `-- jquery.js | |-- puppet_classes | | |-- cd_apache_3A_3Amain_3A_3Aconfig.html +| | |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html | | |-- cd_apache_3A_3Aparams.html | | |-- cd_apache_3A_3Aserver_3A_3Adirs.html | | |-- cd_apache_3A_3Aserver_3A_3Afiles.html @@ -42,6 +43,7 @@ |-- templates | |-- autoindex_conf.erb | |-- httpd_conf.erb +| |-- index_html.erb | |-- magic.erb | |-- ssl_conf.erb | |-- userdir_conf.erb @@ -56,4 +58,4 @@ |-- README.md `-- REPOSTRUCTURE.md -11 directories, 45 files +11 directories, 47 files diff --git a/doc/puppet_classes/cd_apache_3A_3Aparams.html b/doc/puppet_classes/cd_apache_3A_3Aparams.html index 0db5a45..2e597cd 100644 --- a/doc/puppet_classes/cd_apache_3A_3Aparams.html +++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html @@ -488,7 +488,9 @@ disabled.

121 122 123 -124 +124 +125 +126 
# File 'manifests/params.pp', line 59
@@ -553,6 +555,8 @@ $ae_autoindex_file  = "${ae_conf_d_dir}/autoindex.conf"
 $ae_autoindex_erb   = 'cd_apache/autoindex_conf.erb'
 $ae_userdir_file    = "${ae_conf_d_dir}/userdir.conf"
 $ae_userdir_erb     = 'cd_apache/userdir_conf.erb'
+$ae_index_file      = '/var/www/html/index.html'
+$ae_index_erb       = 'cd_apache/index_html.erb'
 
 # includes must be last
 
diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
index 3999796..b3a1fa6 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -219,7 +219,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 112
 113
 114
-115
+115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 
# File 'manifests/server/files.pp', line 24
@@ -296,6 +313,23 @@ class cd_apache::server::files (
       notify    =>  Service['httpd'],
   }
 
+    # manage index.html
+
+    file  { $ae_index_file:
+      ensure    =>  file,
+      path      =>  $ae_index_file,
+      owner     =>  $ae_user_name,
+      group     =>  $ae_user_name,
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  httpd_sys_content_t,
+      seluser   =>  system_u,
+      content   =>  template($ae_index_erb),
+      notify    =>  Service['httpd'],
+  }
+
+
     if $ae_allow_user_dirs == true {
 
     # manage userdir.conf
diff --git a/tests/UTF_Files b/tests/UTF_Files
index a138597..3dd8a12 100644
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -2,5 +2,6 @@
 ./.yardoc/proxy_types: Applesoft BASIC program data
 ./.yardoc/complete: empty
 ./.yardoc/objects/root.dat: data
+./templates/index_html.erb: empty
 ./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
 ./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines