diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac54736..3f5d3ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
No issue
+a23a3bc4c150283 Jenkins ConfDroid 2018-04-20 09:36:16
+
+
recommit for updates in build 7
+
+
+5977dab8c8432e5 Arne Teuke 2018-04-20 09:36:10
+
+
fixes typo
+
+
+dddb9afc18a15d6 Arne Teuke 2018-04-20 09:30:48
+
+
adds fw rules here to ensure fw is managed on apache lavel instead application level
+
+
3e4c6a15e5f8440 Jenkins ConfDroid 2018-04-20 08:32:51
recommit for updates in build 5
@@ -72,11 +87,21 @@ Changelog of Git Changelog.
recommit for updates in build 17
+
+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23
+
+
finalised this stage
+
c1963582f006a9d Jenkins Server 2017-07-11 17:08:47
recommit for updates in build 16
+
+19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45
+
+
finalised this stage
+
f1988c6272ba4a6 Jenkins Server 2017-07-11 17:01:52
@@ -137,6 +162,26 @@ Changelog of Git Changelog.
recommit for updates in build 2
+
+ff758351baaf2af Jenkins Server 2017-07-07 15:18:31
+
+
recommit for updates in build 1
+
+
+f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42
+
+
updated README and version
+
+
+44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43
+
+
added Puppet documentation, Jenkinsfile and Gemfile for CI
+
+
+08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53
+
+
updated README
+
v0.0.1.7
@@ -162,16 +207,6 @@ Changelog of Git Changelog.
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
@@ -252,26 +287,6 @@ Changelog of Git Changelog.
updated README
-
-ff758351baaf2af Jenkins Server 2017-07-07 15:18:31
-
-
recommit for updates in build 1
-
-
-f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42
-
-
updated README and version
-
-
-44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43
-
-
added Puppet documentation, Jenkinsfile and Gemfile for CI
-
-
-08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53
-
-
updated README
-
v0.0.0.2
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 05f0f3b..b8c9c33 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,6 +9,7 @@
| | |-- full_list.js
| | `-- jquery.js
| |-- puppet_classes
+| | |-- cd_apache_3A_3Afirewall_3A_3Aiptables.html
| | |-- cd_apache_3A_3Amain_3A_3Aconfig.html
| | |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html
| | |-- cd_apache_3A_3Aparams.html
@@ -60,4 +61,4 @@
|-- README.md
`-- REPOSTRUCTURE.md
-12 directories, 48 files
+12 directories, 49 files
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 b3a1fa6..3853dbf 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -313,23 +313,6 @@ 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
@@ -349,6 +332,23 @@ class cd_apache::server::files (
}
}
}
+
+ # 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'],
+ }
+
}