Recommit for updates in build 7
This commit is contained in:
@@ -93,11 +93,6 @@
|
|||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li>
|
|
||||||
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_gitea::main::install (puppet_class)">confdroid_gitea::main::install</a></span>
|
|
||||||
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_gitea::main::service (puppet_class)">confdroid_gitea::main::service</a></span>
|
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_gitea::main::service (puppet_class)">confdroid_gitea::main::service</a></span>
|
||||||
|
|
||||||
|
|||||||
@@ -84,6 +84,8 @@
|
|||||||
|
|
||||||
<p>Configuration</p>
|
<p>Configuration</p>
|
||||||
<ul><li>
|
<ul><li>
|
||||||
|
<p>install required system user</p>
|
||||||
|
</li><li>
|
||||||
<p>manage directory structure</p>
|
<p>manage directory structure</p>
|
||||||
</li><li>
|
</li><li>
|
||||||
<p>manage configuration files</p>
|
<p>manage configuration files</p>
|
||||||
|
|||||||
@@ -84,6 +84,8 @@
|
|||||||
|
|
||||||
<p>Configuration</p>
|
<p>Configuration</p>
|
||||||
<ul><li>
|
<ul><li>
|
||||||
|
<p>install required system user</p>
|
||||||
|
</li><li>
|
||||||
<p>manage directory structure</p>
|
<p>manage directory structure</p>
|
||||||
</li><li>
|
</li><li>
|
||||||
<p>manage configuration files</p>
|
<p>manage configuration files</p>
|
||||||
|
|||||||
@@ -71,28 +71,21 @@
|
|||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
<li id="object_puppet_classes::confdroid_gitea::main::install" class="even">
|
<li id="object_puppet_classes::confdroid_gitea::main::service" class="even">
|
||||||
<div class="item">
|
|
||||||
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_gitea::main::install (puppet_class)">confdroid_gitea::main::install</a></span>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
|
|
||||||
<li id="object_puppet_classes::confdroid_gitea::main::service" class="odd">
|
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_gitea::main::service (puppet_class)">confdroid_gitea::main::service</a></span>
|
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_gitea::main::service (puppet_class)">confdroid_gitea::main::service</a></span>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
<li id="object_puppet_classes::confdroid_gitea::main::user" class="even">
|
<li id="object_puppet_classes::confdroid_gitea::main::user" class="odd">
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Auser.html" title="puppet_classes::confdroid_gitea::main::user (puppet_class)">confdroid_gitea::main::user</a></span>
|
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Amain_3A_3Auser.html" title="puppet_classes::confdroid_gitea::main::user (puppet_class)">confdroid_gitea::main::user</a></span>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
<li id="object_puppet_classes::confdroid_gitea::params" class="odd">
|
<li id="object_puppet_classes::confdroid_gitea::params" class="even">
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Aparams.html" title="puppet_classes::confdroid_gitea::params (puppet_class)">confdroid_gitea::params</a></span>
|
<span class='object_link'><a href="puppet_classes/confdroid_gitea_3A_3Aparams.html" title="puppet_classes::confdroid_gitea::params (puppet_class)">confdroid_gitea::params</a></span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
class confdroid_gitea::firewall::iptables (
|
class confdroid_gitea::firewall::iptables (
|
||||||
|
|
||||||
) inherits confdroid_gitea::params {
|
) inherits confdroid_gitea::params {
|
||||||
if $ga_use_firewall == true {
|
if ($ga_use_firewall == true) and ($ga_host_fqdn == $fqdn) {
|
||||||
firewall { "${ga_order_prefix}${ga_http_port} allow gitea http port ${ga_http_port}":
|
firewall { "${ga_order_prefix}${ga_http_port} allow gitea http port ${ga_http_port}":
|
||||||
proto => 'tcp',
|
proto => 'tcp',
|
||||||
dport => $ga_http_port,
|
dport => $ga_http_port,
|
||||||
|
|||||||
@@ -113,7 +113,7 @@
|
|||||||
class confdroid_gitea::main::dirs (
|
class confdroid_gitea::main::dirs (
|
||||||
|
|
||||||
) inherits confdroid_gitea::params {
|
) inherits confdroid_gitea::params {
|
||||||
require confdroid_gitea::main::files
|
require confdroid_gitea::main::user
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -105,7 +105,17 @@
|
|||||||
7
|
7
|
||||||
8
|
8
|
||||||
9
|
9
|
||||||
10</pre>
|
10
|
||||||
|
11
|
||||||
|
12
|
||||||
|
13
|
||||||
|
14
|
||||||
|
15
|
||||||
|
16
|
||||||
|
17
|
||||||
|
18
|
||||||
|
19
|
||||||
|
20</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||||
@@ -113,7 +123,17 @@
|
|||||||
class confdroid_gitea::main::files (
|
class confdroid_gitea::main::files (
|
||||||
|
|
||||||
) inherits confdroid_gitea::params {
|
) inherits confdroid_gitea::params {
|
||||||
require confdroid_gitea::main::user
|
if $ga_host_fqdn == $fqdn {
|
||||||
|
require confdroid_gitea::main::dirs
|
||||||
|
|
||||||
|
file { "${ga_working_dir}/gitea":
|
||||||
|
ensure => 'file',
|
||||||
|
mode => '0755',
|
||||||
|
owner => $ga_user,
|
||||||
|
group => $ga_user,
|
||||||
|
source => "${ga_dl_url}/gitea/${ga_dl_version}/gitea-${ga_dl_version}-linux-amd64",
|
||||||
|
}
|
||||||
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -106,7 +106,9 @@
|
|||||||
8
|
8
|
||||||
9
|
9
|
||||||
10
|
10
|
||||||
11</pre>
|
11
|
||||||
|
12
|
||||||
|
13</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
|
||||||
@@ -114,8 +116,10 @@
|
|||||||
class confdroid_gitea::main::service (
|
class confdroid_gitea::main::service (
|
||||||
|
|
||||||
) inherits confdroid_gitea::params {
|
) inherits confdroid_gitea::params {
|
||||||
|
if $ga_host_fqdn == $fqdn {
|
||||||
require confdroid_gitea::firewall::iptables
|
require confdroid_gitea::firewall::iptables
|
||||||
require confdroid_gitea::main::dirs
|
require confdroid_gitea::main::files
|
||||||
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -105,7 +105,14 @@
|
|||||||
7
|
7
|
||||||
8
|
8
|
||||||
9
|
9
|
||||||
10</pre>
|
10
|
||||||
|
11
|
||||||
|
12
|
||||||
|
13
|
||||||
|
14
|
||||||
|
15
|
||||||
|
16
|
||||||
|
17</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 6</span>
|
||||||
@@ -113,7 +120,14 @@
|
|||||||
class confdroid_gitea::main::user (
|
class confdroid_gitea::main::user (
|
||||||
|
|
||||||
) inherits confdroid_gitea::params {
|
) inherits confdroid_gitea::params {
|
||||||
require confdroid_gitea::main::install
|
if $ga_host_fqdn == $fqdn {
|
||||||
|
user { $ga_user:
|
||||||
|
ensure => 'present',
|
||||||
|
managehome => true,
|
||||||
|
shell => '/bin/false',
|
||||||
|
system => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -75,8 +75,6 @@
|
|||||||
|
|
||||||
<span class='object_link'><a href="confdroid_gitea_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_gitea::main::config (puppet_class)">confdroid_gitea::main::config</a></span><br/>
|
<span class='object_link'><a href="confdroid_gitea_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_gitea::main::config (puppet_class)">confdroid_gitea::main::config</a></span><br/>
|
||||||
|
|
||||||
<span class='object_link'><a href="confdroid_gitea_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_gitea::main::install (puppet_class)">confdroid_gitea::main::install</a></span><br/>
|
|
||||||
|
|
||||||
<span class='object_link'><a href="confdroid_gitea_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_gitea::main::service (puppet_class)">confdroid_gitea::main::service</a></span><br/>
|
<span class='object_link'><a href="confdroid_gitea_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_gitea::main::service (puppet_class)">confdroid_gitea::main::service</a></span><br/>
|
||||||
|
|
||||||
<span class='object_link'><a href="confdroid_gitea_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_gitea::firewall::iptables (puppet_class)">confdroid_gitea::firewall::iptables</a></span><br/>
|
<span class='object_link'><a href="confdroid_gitea_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_gitea::firewall::iptables (puppet_class)">confdroid_gitea::firewall::iptables</a></span><br/>
|
||||||
@@ -178,6 +176,96 @@
|
|||||||
—
|
—
|
||||||
<div class='inline'>
|
<div class='inline'>
|
||||||
<p>The order prefix for firewall rules.</p>
|
<p>The order prefix for firewall rules.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<span class='name'>ga_host_fqdn</span>
|
||||||
|
|
||||||
|
|
||||||
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
|
<em class="default">(defaults to: <tt>'gitea.example.net'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>The FQDN for the Gitea host.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<span class='name'>ga_working_dir</span>
|
||||||
|
|
||||||
|
|
||||||
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
|
<em class="default">(defaults to: <tt>'/opt/gitea'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>The working directory for Gitea.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<span class='name'>ga_dl_url</span>
|
||||||
|
|
||||||
|
|
||||||
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
|
<em class="default">(defaults to: <tt>'https://dl.gitea.com/gitea'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>The download URL for Gitea.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<span class='name'>ga_dl_version</span>
|
||||||
|
|
||||||
|
|
||||||
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
|
<em class="default">(defaults to: <tt>'1.25.4'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>The version of Gitea to download.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<span class='name'>ga_user</span>
|
||||||
|
|
||||||
|
|
||||||
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
|
<em class="default">(defaults to: <tt>'git'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>The system user for Gitea.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
@@ -193,11 +281,6 @@
|
|||||||
<pre class="lines">
|
<pre class="lines">
|
||||||
|
|
||||||
|
|
||||||
10
|
|
||||||
11
|
|
||||||
12
|
|
||||||
13
|
|
||||||
14
|
|
||||||
15
|
15
|
||||||
16
|
16
|
||||||
17
|
17
|
||||||
@@ -210,13 +293,32 @@
|
|||||||
24
|
24
|
||||||
25
|
25
|
||||||
26
|
26
|
||||||
27</pre>
|
27
|
||||||
|
28
|
||||||
|
29
|
||||||
|
30
|
||||||
|
31
|
||||||
|
32
|
||||||
|
33
|
||||||
|
34
|
||||||
|
35
|
||||||
|
36
|
||||||
|
37
|
||||||
|
38
|
||||||
|
39</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 10</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 15</span>
|
||||||
|
|
||||||
class confdroid_gitea::params (
|
class confdroid_gitea::params (
|
||||||
|
|
||||||
|
# main
|
||||||
|
String $ga_host_fqdn = 'gitea.example.net',
|
||||||
|
String $ga_working_dir = '/opt/gitea',
|
||||||
|
String $ga_dl_url = 'https://dl.gitea.com/gitea',
|
||||||
|
String $ga_dl_version = '1.25.4',
|
||||||
|
String $ga_user = 'git',
|
||||||
|
|
||||||
# firewall
|
# firewall
|
||||||
Boolean $ga_use_firewall = true,
|
Boolean $ga_use_firewall = true,
|
||||||
String $ga_http_port = '3000',
|
String $ga_http_port = '3000',
|
||||||
|
|||||||
Reference in New Issue
Block a user