Recommit for updates in build 6

This commit is contained in:
2026-02-03 01:16:33 +01:00
parent 26c6872fb5
commit 73dfd171b4
6 changed files with 11 additions and 63 deletions

View File

@@ -113,11 +113,6 @@
</li> </li>
<li>
<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>
</ul> </ul>
</ul> </ul>

View File

@@ -109,8 +109,6 @@
<p>Configuration</p> <p>Configuration</p>
<ul><li> <ul><li>
<p>manage user settings (optional)</p>
</li><li>
<p>manage directory structure (optional)</p> <p>manage directory structure (optional)</p>
</li><li> </li><li>
<p>manage configuration files (optional):</p> <p>manage configuration files (optional):</p>
@@ -200,7 +198,7 @@
<h2 id="label-Contact+Us">Contact Us</h2> <h2 id="label-Contact+Us">Contact Us</h2>
<p><a href="https://confdroid.com/contact/">contact Us</a></p> <p><a href="https://confdroid.com/contact/">contact Us</a> <a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
<h2 id="label-Disclaimer">Disclaimer</h2> <h2 id="label-Disclaimer">Disclaimer</h2>

View File

@@ -109,8 +109,6 @@
<p>Configuration</p> <p>Configuration</p>
<ul><li> <ul><li>
<p>manage user settings (optional)</p>
</li><li>
<p>manage directory structure (optional)</p> <p>manage directory structure (optional)</p>
</li><li> </li><li>
<p>manage configuration files (optional):</p> <p>manage configuration files (optional):</p>
@@ -200,7 +198,7 @@
<h2 id="label-Contact+Us">Contact Us</h2> <h2 id="label-Contact+Us">Contact Us</h2>
<p><a href="https://confdroid.com/contact/">contact Us</a></p> <p><a href="https://confdroid.com/contact/">contact Us</a> <a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
<h2 id="label-Disclaimer">Disclaimer</h2> <h2 id="label-Disclaimer">Disclaimer</h2>

View File

@@ -99,13 +99,6 @@
</li> </li>
<li id="object_puppet_classes::confdroid_apache::server::user" class="even">
<div class="item">
<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>
</ul> </ul>
</div> </div>

View File

@@ -71,8 +71,6 @@
<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="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="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="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="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="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="confdroid_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::confdroid_apache::server::install (puppet_class)">confdroid_apache::server::install</a></span><br/>
@@ -121,12 +119,12 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;latest&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
<p>Specify which [package type] (<a href="https://confdroid.com/2017/05/puppet-type-package">confdroid.com/2017/05/puppet-type-package</a>/) to use, i.e. <code>latest</code>, <code>present</code> or <code>absent</code>.</p> <p>Specify which package type to use, i.e. <code>latest</code>, <code>present</code> or <code>absent</code>.</p>
</div> </div>
</li> </li>
@@ -139,8 +137,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>Boolean</tt>)</span> <span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -157,8 +153,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;apache&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -175,8 +169,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;48&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -193,8 +185,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;Apache&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -211,8 +201,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -229,8 +217,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/share/httpd&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -247,8 +233,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/bin/false&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -424,7 +408,7 @@ inherited by all classes except defines.
<span class='name'>reqpackages</span> <span class='name'>reqpackages</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;httpd&#39;,&#39;mod_ssl&#39;]</tt>)</em> <em class="default">(defaults to: <tt>[&#39;httpd&#39;,&#39;mod_ssl&#39;]</tt>)</em>
@@ -448,6 +432,7 @@ inherited by all classes except defines.
<pre class="lines"> <pre class="lines">
46
47 47
48 48
49 49
@@ -503,35 +488,16 @@ inherited by all classes except defines.
99 99
100 100
101 101
102 102</pre>
103
104
105
106
107
108
109
110
111
112</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 47</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 46</span>
class confdroid_apache::params ( class confdroid_apache::params (
# installation # installation
String $pkg_ensure = &#39;latest&#39;, String $pkg_ensure = &#39;present&#39;,
String $reqpackages = [&#39;httpd&#39;,&#39;mod_ssl&#39;], Array $reqpackages = [&#39;httpd&#39;,&#39;mod_ssl&#39;],
Boolean $ae_manage_user = false,
String $ae_user_name = &#39;apache&#39;,
String $ae_user_uid = &#39;48&#39;,
String $ae_u_comment = &#39;Apache&#39;,
String $ae_u_groups = undef,
String $ae_user_home = &#39;/usr/share/httpd&#39;,
String $ae_user_shell = &#39;/bin/false&#39;,
# configuration files # configuration files
Boolean $ae_manage_cfg = false, Boolean $ae_manage_cfg = false,

View File

@@ -292,8 +292,7 @@ httpd service.
194 194
195 195
196 196
197 197</pre>
198</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/server/dirs.pp', line 7</span> <pre class="code"><span class="info file"># File 'manifests/server/dirs.pp', line 7</span>
@@ -301,7 +300,6 @@ httpd service.
class confdroid_apache::server::dirs ( class confdroid_apache::server::dirs (
) inherits confdroid_apache::params { ) inherits confdroid_apache::params {
require confdroid_apache::server::user
if $ae_manage_dirs == true { if $ae_manage_dirs == true {
# create main dir # create main dir