Recommit for updates in build 39
This commit is contained in:
@@ -70,6 +70,8 @@
|
||||
</li><li>
|
||||
<p><a href="#features">Features</a></p>
|
||||
</li><li>
|
||||
<p><a href="#adding-custom-configurations">Adding custom configurations</a></p>
|
||||
</li><li>
|
||||
<p><a href="#support">Support</a></p>
|
||||
</li><li>
|
||||
<p><a href="#parameter-inheritance">Parameter Inheritance</a></p>
|
||||
@@ -104,9 +106,27 @@
|
||||
<p>(optional) manage firewall</p>
|
||||
</li></ul>
|
||||
|
||||
<blockquote>
|
||||
<p>ToDo: Define for custom drop-in configurations</p>
|
||||
</blockquote>
|
||||
<h2 id="label-Adding+custom+configurations">Adding custom configurations</h2>
|
||||
|
||||
<p>Custom configuration files live in <code>/etc/ssh/sshd_config.d/</code>. IN order to create a custom config file, add a stanza like this in your control repo:</p>
|
||||
|
||||
<pre class="code ruby"><code class="ruby">confdroid_ssh::custom::custom_config { '30-my-custom-rule':
|
||||
config_name => '30-custom-rule',
|
||||
config_content => ['PasswordAuthentication no'],
|
||||
}
|
||||
</code></pre>
|
||||
|
||||
<p>This will create a file /etc/ssh/sshd_config.d/30-custom-rule.conf with this content:</p>
|
||||
|
||||
<pre class="code ruby"><code class="ruby"><span class='comment'>###############################################################################
|
||||
</span><span class='comment'>##### DO NOT EDIT THIS FILE MANUALLY #
|
||||
</span><span class='comment'>##### This file is managed by Puppet. Any changes to this file will be #
|
||||
</span><span class='comment'>##### overwritten. Update the Puppet define input instead. #
|
||||
</span><span class='comment'>###############################################################################
|
||||
</span><span class='const'>PasswordAuthentication</span> <span class='id identifier rubyid_no'>no</span>
|
||||
</code></pre>
|
||||
|
||||
<p>Note that the value for config_content <strong>has to be an array</strong>, even if only one key pair is in there. This field is designed to hold multiple values, which create one line in the config file each.</p>
|
||||
|
||||
<h2 id="label-Support">Support</h2>
|
||||
<ul><li>
|
||||
|
||||
@@ -70,6 +70,8 @@
|
||||
</li><li>
|
||||
<p><a href="#features">Features</a></p>
|
||||
</li><li>
|
||||
<p><a href="#adding-custom-configurations">Adding custom configurations</a></p>
|
||||
</li><li>
|
||||
<p><a href="#support">Support</a></p>
|
||||
</li><li>
|
||||
<p><a href="#parameter-inheritance">Parameter Inheritance</a></p>
|
||||
@@ -104,9 +106,27 @@
|
||||
<p>(optional) manage firewall</p>
|
||||
</li></ul>
|
||||
|
||||
<blockquote>
|
||||
<p>ToDo: Define for custom drop-in configurations</p>
|
||||
</blockquote>
|
||||
<h2 id="label-Adding+custom+configurations">Adding custom configurations</h2>
|
||||
|
||||
<p>Custom configuration files live in <code>/etc/ssh/sshd_config.d/</code>. IN order to create a custom config file, add a stanza like this in your control repo:</p>
|
||||
|
||||
<pre class="code ruby"><code class="ruby">confdroid_ssh::custom::custom_config { '30-my-custom-rule':
|
||||
config_name => '30-custom-rule',
|
||||
config_content => ['PasswordAuthentication no'],
|
||||
}
|
||||
</code></pre>
|
||||
|
||||
<p>This will create a file /etc/ssh/sshd_config.d/30-custom-rule.conf with this content:</p>
|
||||
|
||||
<pre class="code ruby"><code class="ruby"><span class='comment'>###############################################################################
|
||||
</span><span class='comment'>##### DO NOT EDIT THIS FILE MANUALLY #
|
||||
</span><span class='comment'>##### This file is managed by Puppet. Any changes to this file will be #
|
||||
</span><span class='comment'>##### overwritten. Update the Puppet define input instead. #
|
||||
</span><span class='comment'>###############################################################################
|
||||
</span><span class='const'>PasswordAuthentication</span> <span class='id identifier rubyid_no'>no</span>
|
||||
</code></pre>
|
||||
|
||||
<p>Note that the value for config_content <strong>has to be an array</strong>, even if only one key pair is in there. This field is designed to hold multiple values, which create one line in the config file each.</p>
|
||||
|
||||
<h2 id="label-Support">Support</h2>
|
||||
<ul><li>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
<div class="docstring">
|
||||
<div class="discussion">
|
||||
|
||||
<p>confdroid_ssh::custom::custom_config.pp Module name: confdroid_ssh Author: 12ww1160 (12ww1160@confdroid.com)</p>
|
||||
<p>confdroid_ssh::custom::custom_config.pp Module name: confdroid_ssh Author: 12ww1160 (12ww1160@confdroid.com) } this will create a file called /etc/ssh/sshd_config.d/50-test.conf with the content: PasswordAuthentication no and notify the sshd service to reload the configuration</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -84,6 +84,16 @@
|
||||
|
||||
|
||||
<div class="tags">
|
||||
|
||||
<div class="examples">
|
||||
<p class="tag_title">Examples:</p>
|
||||
|
||||
|
||||
<pre class="example code"><code>confdroid_ssh::custom::custom_config { '50-test':
|
||||
config_name => '50-test',
|
||||
config_content => ['PasswordAuthentication no'],</code></pre>
|
||||
|
||||
</div>
|
||||
<p class="tag_title">Parameters:</p>
|
||||
<ul class="param">
|
||||
|
||||
@@ -130,13 +140,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
10
|
||||
11
|
||||
12
|
||||
13
|
||||
14
|
||||
15
|
||||
16
|
||||
17
|
||||
18
|
||||
19
|
||||
@@ -154,10 +157,17 @@
|
||||
31
|
||||
32
|
||||
33
|
||||
34</pre>
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/custom/custom_config.pp', line 10</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/custom/custom_config.pp', line 17</span>
|
||||
|
||||
define confdroid_ssh::custom::custom_config (
|
||||
|
||||
@@ -169,11 +179,10 @@ define confdroid_ssh::custom::custom_config (
|
||||
$sshd_service = $confdroid_ssh::params::sshd_service
|
||||
$custom_config_erb = 'confdroid_ssh/custom_config.erb'
|
||||
$config_basename = regsubst($config_name, '\\.conf$', '')
|
||||
$config_file = "${config_basename}.conf"
|
||||
$config_file = "${config_name}.conf"
|
||||
|
||||
file { "${sshd_custom_path}/${config_file}":
|
||||
ensure => file,
|
||||
content => template($custom_config_erb),
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0600',
|
||||
@@ -181,6 +190,7 @@ define confdroid_ssh::custom::custom_config (
|
||||
selrole => object_r,
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
content => template($custom_config_erb),
|
||||
notify => Service[$sshd_service],
|
||||
}
|
||||
}</pre>
|
||||
|
||||
Reference in New Issue
Block a user