OP#409 initial commit after fork

This commit is contained in:
12ww1160
2026-02-03 00:41:35 +01:00
parent 3fe5000d8e
commit 526aed6b88
27 changed files with 256 additions and 221 deletions

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@
Gemfile.lock
FileList
.scannerwork
.vscode

35
Jenkinsfile vendored
View File

@@ -69,7 +69,7 @@ pipeline {
withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
sh '''
/opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.projectKey=cd_apache \
-Dsonar.projectKey=cconfdroid_apache \
-Dsonar.sources=. \
-Dsonar.host.url=https://sonarqube.confdroid.com \
-Dsonar.token=$SONAR_TOKEN
@@ -90,16 +90,37 @@ pipeline {
sh '''
git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
git rm -r --cached .vscode || echo "No .vscode to remove from git"
git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git push -o merge_request.create \
-o merge_request.target=master \
-o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
-o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
-o merge_request.merge_when_pipeline_succeeds=true \
origin jenkins-build-$BUILD_NUMBER
git push origin HEAD:master
'''
}
}
}
stage('Mirror to Gitea') {
steps {
withCredentials([usernamePassword(
credentialsId: 'Jenkins-gitea',
usernameVariable: 'GITEA_USER',
passwordVariable: 'GITEA_TOKEN')]) {
script {
// Checkout from GitLab (already done implicitly)
sh '''
git checkout master
git pull origin master
git branch -D development
git branch -D jenkins-build-$BUILD_NUMBER
git rm -f Jenkinsfile
git rm -r --cached .vscode || echo "No .vscode to remove from git"
git commit --amend --no-edit --allow-empty
git remote add master https://gitea.confdroid.com/confdroid/confdroid_apache.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --mirror
'''
}
}
}
}
}
}

View File

@@ -1,14 +1,27 @@
# README
[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)
[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_apache)](https://jenkins.confdroid.com/job/confdroid_apache/)
- [README](#readme)
- [Synopsis](#synopsis)
- [WARNING](#warning)
- [Features](#features)
- [vHosts](#vhosts)
- [Dependencies](#dependencies)
- [Deployment](#deployment)
- [Parameters](#parameters)
- [SELINUX](#selinux)
- [Support](#support)
- [Tests](#tests)
- [Contact Us](#contact-us)
- [Disclaimer](#disclaimer)
[[_TOC_]]
## Synopsis
`Apache httpd` is a very powerful and widely used web server.
`cd_apache` automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.
`confdroid_apache` automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.
## WARNING
@@ -43,7 +56,7 @@ As stated in the synopsis, this module was written particularly for usage as bas
* WordPress
* Nagios etc.
With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of `cd_apache` to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add `cd_apache` as requirement (i.e. require cd_apache) so it gets installed automatically.
With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of `confdroid_apache` to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add `confdroid_apache` as requirement (i.e. require confdroid_apache) so it gets installed automatically.
### Dependencies
@@ -59,13 +72,13 @@ via site.pp or nodes.pp
```bash
node 'example.example.net' {
include cd_apache
include confdroid_apache
}
```
* through Foreman:
In order to apply parameters through Foreman, **__cd_apache::params__** must be added to the host or host group in question.
In order to apply parameters through Foreman, **__confdroid_apache::params__** must be added to the host or host group in question.
See [more details about class deployment on Confdroid.com](https://confdroid.com/2017/05/deploying-our-puppet-modules/).

View File

@@ -69,52 +69,52 @@
<ul>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache.html" title="puppet_classes::cd_apache (puppet_class)">cd_apache</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache.html" title="puppet_classes::confdroid_apache (puppet_class)">confdroid_apache</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_apache::firewall::iptables (puppet_class)">cd_apache::firewall::iptables</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_apache::firewall::iptables (puppet_class)">confdroid_apache::firewall::iptables</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::cd_apache::main::config (puppet_class)">cd_apache::main::config</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_apache::main::config (puppet_class)">confdroid_apache::main::config</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::cd_apache::monitoring::target (puppet_class)">cd_apache::monitoring::target</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_apache::monitoring::target (puppet_class)">confdroid_apache::monitoring::target</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::cd_apache::server::dirs (puppet_class)">cd_apache::server::dirs</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::confdroid_apache::server::dirs (puppet_class)">confdroid_apache::server::dirs</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::cd_apache::server::files (puppet_class)">cd_apache::server::files</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_apache::server::files (puppet_class)">confdroid_apache::server::files</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::cd_apache::server::install (puppet_class)">cd_apache::server::install</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::confdroid_apache::server::install (puppet_class)">confdroid_apache::server::install</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_apache::server::service (puppet_class)">cd_apache::server::service</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_apache::server::service (puppet_class)">confdroid_apache::server::service</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::cd_apache::server::user (puppet_class)">cd_apache::server::user</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::confdroid_apache::server::user (puppet_class)">confdroid_apache::server::user</a></span>
</li>

View File

@@ -60,7 +60,7 @@
<div id="content"><div id='filecontents'>
<h1 id="label-README">README</h1>
<p><a href="https://jenkins.confdroid.com/job/cd_apache/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache"></a></p>
<p><a href="https://jenkins.confdroid.com/job/confdroid_apache/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_apache"></a></p>
<p>[[<em>TOC</em>]]</p>
@@ -68,7 +68,7 @@
<p><code>Apache httpd</code> is a very powerful and widely used web server.</p>
<p><code>cd_apache</code> automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.</p>
<p><code>confdroid_apache</code> automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.</p>
<h2 id="label-WARNING">WARNING</h2>
@@ -116,7 +116,7 @@
<p>Nagios etc.</p>
</li></ul>
<p>With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of <code>cd_apache</code> to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add <code>cd_apache</code> as requirement (i.e. require cd_apache) so it gets installed automatically.</p>
<p>With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of <code>confdroid_apache</code> to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add <code>confdroid_apache</code> as requirement (i.e. require confdroid_apache) so it gets installed automatically.</p>
<h3 id="label-Dependencies">Dependencies</h3>
@@ -133,14 +133,14 @@
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include cd_apache
include confdroid_apache
}
</code></pre>
<ul><li>
<p>through Foreman:</p>
</li></ul>
<p>In order to apply parameters through Foreman, <strong>cd_apache::params</strong> must be added to the host or host group in question.</p>
<p>In order to apply parameters through Foreman, <strong>confdroid_apache::params</strong> must be added to the host or host group in question.</p>
<p>See <a href="https://confdroid.com/2017/05/deploying-our-puppet-modules/">more details about class deployment on Confdroid.com</a>.</p>

View File

@@ -60,7 +60,7 @@
<div id="content"><div id='filecontents'>
<h1 id="label-README">README</h1>
<p><a href="https://jenkins.confdroid.com/job/cd_apache/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache"></a></p>
<p><a href="https://jenkins.confdroid.com/job/confdroid_apache/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_apache"></a></p>
<p>[[<em>TOC</em>]]</p>
@@ -68,7 +68,7 @@
<p><code>Apache httpd</code> is a very powerful and widely used web server.</p>
<p><code>cd_apache</code> automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.</p>
<p><code>confdroid_apache</code> automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.</p>
<h2 id="label-WARNING">WARNING</h2>
@@ -116,7 +116,7 @@
<p>Nagios etc.</p>
</li></ul>
<p>With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of <code>cd_apache</code> to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add <code>cd_apache</code> as requirement (i.e. require cd_apache) so it gets installed automatically.</p>
<p>With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of <code>confdroid_apache</code> to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add <code>confdroid_apache</code> as requirement (i.e. require confdroid_apache) so it gets installed automatically.</p>
<h3 id="label-Dependencies">Dependencies</h3>
@@ -133,14 +133,14 @@
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include cd_apache
include confdroid_apache
}
</code></pre>
<ul><li>
<p>through Foreman:</p>
</li></ul>
<p>In order to apply parameters through Foreman, <strong>cd_apache::params</strong> must be added to the host or host group in question.</p>
<p>In order to apply parameters through Foreman, <strong>confdroid_apache::params</strong> must be added to the host or host group in question.</p>
<p>See <a href="https://confdroid.com/2017/05/deploying-our-puppet-modules/">more details about class deployment on Confdroid.com</a>.</p>

View File

@@ -36,72 +36,72 @@
<ul id="full_list" class="puppet_class">
<li id="object_puppet_classes::cd_apache" class="odd">
<li id="object_puppet_classes::confdroid_apache" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache.html" title="puppet_classes::cd_apache (puppet_class)">cd_apache</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache.html" title="puppet_classes::confdroid_apache (puppet_class)">confdroid_apache</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::firewall::iptables" class="even">
<li id="object_puppet_classes::confdroid_apache::firewall::iptables" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_apache::firewall::iptables (puppet_class)">cd_apache::firewall::iptables</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_apache::firewall::iptables (puppet_class)">confdroid_apache::firewall::iptables</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::main::config" class="odd">
<li id="object_puppet_classes::confdroid_apache::main::config" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::cd_apache::main::config (puppet_class)">cd_apache::main::config</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_apache::main::config (puppet_class)">confdroid_apache::main::config</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::monitoring::target" class="even">
<li id="object_puppet_classes::confdroid_apache::monitoring::target" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::cd_apache::monitoring::target (puppet_class)">cd_apache::monitoring::target</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_apache::monitoring::target (puppet_class)">confdroid_apache::monitoring::target</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::params" class="odd">
<li id="object_puppet_classes::confdroid_apache::params" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::server::dirs" class="even">
<li id="object_puppet_classes::confdroid_apache::server::dirs" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::cd_apache::server::dirs (puppet_class)">cd_apache::server::dirs</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::confdroid_apache::server::dirs (puppet_class)">confdroid_apache::server::dirs</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::server::files" class="odd">
<li id="object_puppet_classes::confdroid_apache::server::files" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::cd_apache::server::files (puppet_class)">cd_apache::server::files</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_apache::server::files (puppet_class)">confdroid_apache::server::files</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::server::install" class="even">
<li id="object_puppet_classes::confdroid_apache::server::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::cd_apache::server::install (puppet_class)">cd_apache::server::install</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::confdroid_apache::server::install (puppet_class)">confdroid_apache::server::install</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::server::service" class="odd">
<li id="object_puppet_classes::confdroid_apache::server::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_apache::server::service (puppet_class)">cd_apache::server::service</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_apache::server::service (puppet_class)">confdroid_apache::server::service</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_apache::server::user" class="even">
<li id="object_puppet_classes::confdroid_apache::server::user" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::cd_apache::server::user (puppet_class)">cd_apache::server::user</a></span>
<span class='object_link'><a href="puppet_classes/confdroid_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::confdroid_apache::server::user (puppet_class)">confdroid_apache::server::user</a></span>
</div>
</li>

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache
Puppet Class: confdroid_apache
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache";
pathId = "puppet_classes::confdroid_apache";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache</span>
<span class="title">confdroid_apache</span>
</div>
@@ -59,7 +59,7 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache</h1>
<div id="content"><h1>Puppet Class: confdroid_apache</h1>
<div class="box_info">
@@ -72,13 +72,13 @@
</div>
<h2>Summary</h2>
initializes the cd_apache Puppet module.
initializes the confdroid_apache Puppet module.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>cd_apache::init.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::init.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -103,8 +103,8 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/init.pp', line 6</span>
class cd_apache {
include cd_apache::params
class confdroid_apache {
include confdroid_apache::params
}</pre>
</td>
</tr>

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::firewall::iptables
Puppet Class: confdroid_apache::firewall::iptables
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::firewall::iptables";
pathId = "puppet_classes::confdroid_apache::firewall::iptables";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::firewall::iptables</span>
<span class="title">confdroid_apache::firewall::iptables</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::firewall::iptables</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::firewall::iptables</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::firewall::iptables.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@ConfDroid.com)</p>
<p>confdroid_apache::firewall::iptables.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@ConfDroid.com)</p>
</div>
</div>
@@ -122,9 +122,9 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
class cd_apache::firewall::iptables (
class confdroid_apache::firewall::iptables (
) inherits cd_apache::params {
) inherits confdroid_apache::params {
if $ae_manage_fw == true {
firewall { &quot;${ae_order_no}${ae_http_port} tcp http port ${ae_http_port}&quot;:
proto =&gt; [&#39;tcp&#39;,&#39;udp&#39;],

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::main::config
Puppet Class: confdroid_apache::main::config
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::main::config";
pathId = "puppet_classes::confdroid_apache::main::config";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::main::config</span>
<span class="title">confdroid_apache::main::config</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::main::config</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::main::config</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::main::config.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::main::config.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -111,11 +111,11 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
class cd_apache::main::config (
class confdroid_apache::main::config (
) inherits cd_apache::params {
include cd_apache::server::service
include cd_apache::monitoring::target
) inherits confdroid_apache::params {
include confdroid_apache::server::service
include confdroid_apache::monitoring::target
}</pre>
</td>
</tr>

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::monitoring::target
Puppet Class: confdroid_apache::monitoring::target
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::monitoring::target";
pathId = "puppet_classes::confdroid_apache::monitoring::target";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::monitoring::target</span>
<span class="title">confdroid_apache::monitoring::target</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::monitoring::target</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::monitoring::target</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::monitoring::target.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@puppetsoft.com)</p>
<p>confdroid_apache::monitoring::target.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@puppetsoft.com)</p>
</div>
</div>
@@ -127,9 +127,9 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
class cd_apache::monitoring::target (
class confdroid_apache::monitoring::target (
) inherits cd_apache::params {
) inherits confdroid_apache::params {
case $ae_incl_target {
false: { notify { &#39;Nagios Service target for check_httpd has been disabled via parameters / ENC override&#39;: }
}

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::params
Puppet Class: confdroid_apache::params
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::params";
pathId = "puppet_classes::confdroid_apache::params";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::params</span>
<span class="title">confdroid_apache::params</span>
</div>
@@ -59,7 +59,7 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::params</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::params</h1>
<div class="box_info">
@@ -67,21 +67,21 @@
<dt>Inherited by:</dt>
<dd>
<span class='object_link'><a href="cd_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::cd_apache::main::config (puppet_class)">cd_apache::main::config</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_apache::main::config (puppet_class)">confdroid_apache::main::config</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::cd_apache::server::dirs (puppet_class)">cd_apache::server::dirs</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::confdroid_apache::server::dirs (puppet_class)">confdroid_apache::server::dirs</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::cd_apache::server::user (puppet_class)">cd_apache::server::user</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::confdroid_apache::server::user (puppet_class)">confdroid_apache::server::user</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::cd_apache::server::files (puppet_class)">cd_apache::server::files</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_apache::server::files (puppet_class)">confdroid_apache::server::files</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::cd_apache::server::install (puppet_class)">cd_apache::server::install</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::confdroid_apache::server::install (puppet_class)">confdroid_apache::server::install</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_apache::server::service (puppet_class)">cd_apache::server::service</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_apache::server::service (puppet_class)">confdroid_apache::server::service</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_apache::firewall::iptables (puppet_class)">cd_apache::firewall::iptables</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_apache::firewall::iptables (puppet_class)">confdroid_apache::firewall::iptables</a></span><br/>
<span class='object_link'><a href="cd_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::cd_apache::monitoring::target (puppet_class)">cd_apache::monitoring::target</a></span><br/>
<span class='object_link'><a href="confdroid_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_apache::monitoring::target (puppet_class)">confdroid_apache::monitoring::target</a></span><br/>
</dd>
</dl>
@@ -95,14 +95,14 @@
</div>
<h2>Summary</h2>
This class holds all parameters for the cd_apache module, which are
This class holds all parameters for the confdroid_apache module, which are
inherited by all classes except defines.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>cd_apache::params.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::params.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -270,7 +270,7 @@ inherited by all classes except defines.
&mdash;
<div class='inline'>
<p>Whether or not to manage the httpd configuration. httpd is very often a sub system used by many other services, and the required configuration depends on the use case. If using httpd as sub-service ( i.e. for phpmyadmin, Nagios etc.), the main configuration should be done on that end, not in cd_apache. IN that case, set <code>ae_manage_cfg</code> to <code>false</code>.</p>
<p>Whether or not to manage the httpd configuration. httpd is very often a sub system used by many other services, and the required configuration depends on the use case. If using httpd as sub-service ( i.e. for phpmyadmin, Nagios etc.), the main configuration should be done on that end, not in confdroid_apache. IN that case, set <code>ae_manage_cfg</code> to <code>false</code>.</p>
</div>
</li>
@@ -518,7 +518,7 @@ inherited by all classes except defines.
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 47</span>
class cd_apache::params (
class confdroid_apache::params (
# installation
String $pkg_ensure = &#39;latest&#39;,
@@ -569,20 +569,20 @@ class cd_apache::params (
# files
$ae_conf_file = &quot;${ae_conf_dir}/httpd.conf&quot;
$ae_conf_file_erb = &#39;cd_apache/httpd_conf.erb&#39;
$ae_conf_file_erb = &#39;confdroid_apache/httpd_conf.erb&#39;
$ae_magic_file = &quot;${ae_conf_dir}/magic&quot;
$ae_magic_file_erb = &#39;cd_apache/magic.erb&#39;
$ae_magic_file_erb = &#39;confdroid_apache/magic.erb&#39;
$ae_ssl_file = &quot;${ae_conf_d_dir}/ssl.conf&quot;
$ae_ssl_file_erb = &#39;cd_apache/ssl_conf.erb&#39;
$ae_ssl_file_erb = &#39;confdroid_apache/ssl_conf.erb&#39;
$ae_autoindex_file = &quot;${ae_conf_d_dir}/autoindex.conf&quot;
$ae_autoindex_erb = &#39;cd_apache/autoindex_conf.erb&#39;
$ae_autoindex_erb = &#39;confdroid_apache/autoindex_conf.erb&#39;
$ae_userdir_file = &quot;${ae_conf_d_dir}/userdir.conf&quot;
$ae_userdir_erb = &#39;cd_apache/userdir_conf.erb&#39;
$ae_userdir_erb = &#39;confdroid_apache/userdir_conf.erb&#39;
$ae_index_file = &#39;/var/www/html/index.html&#39;
$ae_index_erb = &#39;cd_apache/index_html.erb&#39;
$ae_index_erb = &#39;confdroid_apache/index_html.erb&#39;
# includes must be last
include cd_apache::main::config
include confdroid_apache::main::config
}</pre>
</td>
</tr>

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::server::dirs
Puppet Class: confdroid_apache::server::dirs
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::server::dirs";
pathId = "puppet_classes::confdroid_apache::server::dirs";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::server::dirs</span>
<span class="title">confdroid_apache::server::dirs</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::server::dirs</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::server::dirs</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -84,7 +84,7 @@ httpd service.
<div class="docstring">
<div class="discussion">
<p>cd_apache::server::dirs.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::server::dirs.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -298,10 +298,10 @@ httpd service.
<td>
<pre class="code"><span class="info file"># File 'manifests/server/dirs.pp', line 7</span>
class cd_apache::server::dirs (
class confdroid_apache::server::dirs (
) inherits cd_apache::params {
require cd_apache::server::user
) inherits confdroid_apache::params {
require confdroid_apache::server::user
if $ae_manage_dirs == true {
# create main dir

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::server::files
Puppet Class: confdroid_apache::server::files
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::server::files";
pathId = "puppet_classes::confdroid_apache::server::files";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::server::files</span>
<span class="title">confdroid_apache::server::files</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::server::files</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::server::files</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::server::files.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::server::files.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -210,10 +210,10 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
class cd_apache::server::files (
class confdroid_apache::server::files (
) inherits cd_apache::params {
require cd_apache::server::dirs
) inherits confdroid_apache::params {
require confdroid_apache::server::dirs
if $ae_manage_cfg == true {
# manage main config file

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::server::install
Puppet Class: confdroid_apache::server::install
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::server::install";
pathId = "puppet_classes::confdroid_apache::server::install";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::server::install</span>
<span class="title">confdroid_apache::server::install</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::server::install</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::server::install</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::server::install.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::server::install.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -114,9 +114,9 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/server/install.pp', line 6</span>
class cd_apache::server::install (
class confdroid_apache::server::install (
) inherits cd_apache::params {
) inherits confdroid_apache::params {
require cd_resources
package { $reqpackages:

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::server::service
Puppet Class: confdroid_apache::server::service
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::server::service";
pathId = "puppet_classes::confdroid_apache::server::service";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::server::service</span>
<span class="title">confdroid_apache::server::service</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::server::service</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::server::service</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::server::service.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::server::service.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -118,11 +118,11 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
class cd_apache::server::service (
class confdroid_apache::server::service (
) inherits cd_apache::params {
require cd_apache::server::files
require cd_apache::firewall::iptables
) inherits confdroid_apache::params {
require confdroid_apache::server::files
require confdroid_apache::firewall::iptables
service { $ae_service:
ensure =&gt; running,

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_apache::server::user
Puppet Class: confdroid_apache::server::user
&mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::cd_apache::server::user";
pathId = "puppet_classes::confdroid_apache::server::user";
relpath = '../';
</script>
@@ -39,7 +39,7 @@
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_apache::server::user</span>
<span class="title">confdroid_apache::server::user</span>
</div>
@@ -59,12 +59,12 @@
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_apache::server::user</h1>
<div id="content"><h1>Puppet Class: confdroid_apache::server::user</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
<dd><span class='object_link'><a href="confdroid_apache_3A_3Aparams.html" title="puppet_classes::confdroid_apache::params (puppet_class)">confdroid_apache::params</a></span></dd>
</dl>
@@ -83,7 +83,7 @@
<div class="docstring">
<div class="discussion">
<p>cd_apache::server:;user.pp Module name: cd_apache Author: Arne Teuke (arne_teuke@confdroid.com)</p>
<p>confdroid_apache::server:;user.pp Module name: confdroid_apache Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -137,10 +137,10 @@
<td>
<pre class="code"><span class="info file"># File 'manifests/server/user.pp', line 6</span>
class cd_apache::server::user (
class confdroid_apache::server::user (
) inherits cd_apache::params {
require cd_apache::server::install
) inherits confdroid_apache::params {
require confdroid_apache::server::install
if $ae_manage_user == true {
group { $ae_user_name:

View File

@@ -1,11 +1,11 @@
## cd_apache::firewall::iptables.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@ConfDroid.com)
## confdroid_apache::firewall::iptables.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@ConfDroid.com)
# @summary manage firewall settings through cd_firewall or puppetlabs-firewall
###############################################################################
class cd_apache::firewall::iptables (
class confdroid_apache::firewall::iptables (
) inherits cd_apache::params {
) inherits confdroid_apache::params {
if $ae_manage_fw == true {
firewall { "${ae_order_no}${ae_http_port} tcp http port ${ae_http_port}":
proto => ['tcp','udp'],

View File

@@ -1,8 +1,8 @@
## cd_apache::init.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
# @summary initializes the cd_apache Puppet module.
## confdroid_apache::init.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary initializes the confdroid_apache Puppet module.
##############################################################################
class cd_apache {
include cd_apache::params
class confdroid_apache {
include confdroid_apache::params
}

View File

@@ -1,11 +1,11 @@
## cd_apache::main::config.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
## confdroid_apache::main::config.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary configure the module classes to be used.
##############################################################################
class cd_apache::main::config (
class confdroid_apache::main::config (
) inherits cd_apache::params {
include cd_apache::server::service
include cd_apache::monitoring::target
) inherits confdroid_apache::params {
include confdroid_apache::server::service
include confdroid_apache::monitoring::target
}

View File

@@ -1,11 +1,11 @@
## cd_apache::monitoring::target.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@puppetsoft.com)
## confdroid_apache::monitoring::target.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@puppetsoft.com)
# @summary class manages exports for nagios monitoring
##############################################################################
class cd_apache::monitoring::target (
class confdroid_apache::monitoring::target (
) inherits cd_apache::params {
) inherits confdroid_apache::params {
case $ae_incl_target {
false: { notify { 'Nagios Service target for check_httpd has been disabled via parameters / ENC override': }
}

View File

@@ -1,7 +1,7 @@
## cd_apache::params.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
# @summary This class holds all parameters for the cd_apache module, which are
## confdroid_apache::params.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary This class holds all parameters for the confdroid_apache module, which are
# inherited by all classes except defines.
# @param [String] pkg_ensure Specify which
# [package type] (https://confdroid.com/2017/05/puppet-type-package/)
@@ -29,7 +29,7 @@
# configuration. httpd is very often a sub system used by many other services,
# and the required configuration depends on the use case. If using httpd as
# sub-service ( i.e. for phpmyadmin, Nagios etc.), the main configuration
# should be done on that end, not in cd_apache. IN that case, set `ae_manage_cfg`
# should be done on that end, not in confdroid_apache. IN that case, set `ae_manage_cfg`
# to `false`.
# @param [Boolean] ae_manage_dirs Whether or not main directories required
# to run httpd should be managed. Typically this should be set to true.
@@ -44,7 +44,7 @@
# @param [Boolean] ae_manage_fw whether to manage firewall settings
# @param [String] reqpackages List of packages to install.
###########################################################################
class cd_apache::params (
class confdroid_apache::params (
# installation
String $pkg_ensure = 'latest',
@@ -95,18 +95,18 @@ class cd_apache::params (
# files
$ae_conf_file = "${ae_conf_dir}/httpd.conf"
$ae_conf_file_erb = 'cd_apache/httpd_conf.erb'
$ae_conf_file_erb = 'confdroid_apache/httpd_conf.erb'
$ae_magic_file = "${ae_conf_dir}/magic"
$ae_magic_file_erb = 'cd_apache/magic.erb'
$ae_magic_file_erb = 'confdroid_apache/magic.erb'
$ae_ssl_file = "${ae_conf_d_dir}/ssl.conf"
$ae_ssl_file_erb = 'cd_apache/ssl_conf.erb'
$ae_ssl_file_erb = 'confdroid_apache/ssl_conf.erb'
$ae_autoindex_file = "${ae_conf_d_dir}/autoindex.conf"
$ae_autoindex_erb = 'cd_apache/autoindex_conf.erb'
$ae_autoindex_erb = 'confdroid_apache/autoindex_conf.erb'
$ae_userdir_file = "${ae_conf_d_dir}/userdir.conf"
$ae_userdir_erb = 'cd_apache/userdir_conf.erb'
$ae_userdir_erb = 'confdroid_apache/userdir_conf.erb'
$ae_index_file = '/var/www/html/index.html'
$ae_index_erb = 'cd_apache/index_html.erb'
$ae_index_erb = 'confdroid_apache/index_html.erb'
# includes must be last
include cd_apache::main::config
include confdroid_apache::main::config
}

View File

@@ -1,13 +1,13 @@
## cd_apache::server::dirs.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
## confdroid_apache::server::dirs.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Manage all aspects of the directory structure required for the
# httpd service.
##############################################################################
class cd_apache::server::dirs (
class confdroid_apache::server::dirs (
) inherits cd_apache::params {
require cd_apache::server::user
) inherits confdroid_apache::params {
require confdroid_apache::server::user
if $ae_manage_dirs == true {
# create main dir

View File

@@ -1,12 +1,12 @@
## cd_apache::server::files.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
## confdroid_apache::server::files.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Manage all aspects for the httpd configuration, if enabled.
##############################################################################
class cd_apache::server::files (
class confdroid_apache::server::files (
) inherits cd_apache::params {
require cd_apache::server::dirs
) inherits confdroid_apache::params {
require confdroid_apache::server::dirs
if $ae_manage_cfg == true {
# manage main config file

View File

@@ -1,11 +1,11 @@
## cd_apache::server::install.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
## confdroid_apache::server::install.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Install required binaries
##############################################################################
class cd_apache::server::install (
class confdroid_apache::server::install (
) inherits cd_apache::params {
) inherits confdroid_apache::params {
require cd_resources
package { $reqpackages:

View File

@@ -1,13 +1,13 @@
## cd_apache::server::service.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
## confdroid_apache::server::service.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary manage the httpd service.
##############################################################################
class cd_apache::server::service (
class confdroid_apache::server::service (
) inherits cd_apache::params {
require cd_apache::server::files
require cd_apache::firewall::iptables
) inherits confdroid_apache::params {
require confdroid_apache::server::files
require confdroid_apache::firewall::iptables
service { $ae_service:
ensure => running,

View File

@@ -1,12 +1,12 @@
## cd_apache::server:;user.pp
# Module name: cd_apache
# Author: Arne Teuke (arne_teuke@confdroid.com)
## confdroid_apache::server:;user.pp
# Module name: confdroid_apache
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary manage all aspects of the httpd service user, if enabled
##############################################################################
class cd_apache::server::user (
class confdroid_apache::server::user (
) inherits cd_apache::params {
require cd_apache::server::install
) inherits confdroid_apache::params {
require confdroid_apache::server::install
if $ae_manage_user == true {
group { $ae_user_name: