From 262a6cf2ca17b246a863457234b2552b51908d63 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Wed, 26 Feb 2025 17:06:15 +0100 Subject: [PATCH] recommit for updates in build 49 --- ...puppet_cd_3A_3Afirewall_3A_3Aiptables.html | 48 +++++++++++- .../puppet_cd_3A_3Amain_3A_3Afiles.html | 8 +- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 78 +++++++++++++++++-- .../puppet_cd_3A_3Aserver_3A_3Aservice.html | 48 ++++++++++-- 4 files changed, 163 insertions(+), 19 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html index 378e051..8c53c9c 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -116,7 +116,30 @@ 18 19 20 -21 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 
# File 'manifests/firewall/iptables.pp', line 6
@@ -136,6 +159,29 @@ class puppet_cd::firewall::iptables (
       jump  => 'accept',
     }
   }
+
+  if $fqdn == $pt_db_fqdn {
+    if $pt_use_ssl_only != true {
+      firewall { "3${pt_no_ssl_port} open port ${pt_no_ssl_port}":
+        proto => 'tcp',
+        dport => $pt_no_ssl_port,
+        jump  => 'accept',
+      }
+      firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
+        proto => 'tcp',
+        dport => $pt_ssl_port,
+        jump  => 'accept',
+      }
+    }
+
+    if $pt_use_ssl_only == true {
+      firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
+        proto => 'tcp',
+        dport => $pt_ssl_port,
+        jump  => 'accept',
+      }
+    }
+  }
 }
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html index 2cfa403..f6aad86 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -105,19 +105,15 @@ 7 8 9 -10 -11 -12 +10 
# File 'manifests/main/files.pp', line 6
 
 class puppet_cd::main::files (
 
-) inherits puppet_cd::params  {
-
+) inherits puppet_cd::params {
   require puppet_cd::main::dirs
-
 }
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 4e16bcf..47d1e4e 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -251,6 +251,60 @@ considered a puppet agent.

—

the packages for puppetdb

+
+ + + +
  • + + pt_no_ssl_port + + + (String) + + + (defaults to: '8080') + + + — +
    +

    non-ssl port number for puppetdb

    +
    + +
    • + +
  • + + pt_ssl_port + + + (String) + + + (defaults to: '8081') + + + — +
    +

    ssl port for puppetdb

    +
    + +
    • + +
  • + + pt_use_ssl_only + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to use ssl only.

    • @@ -266,9 +320,6 @@ considered a puppet agent.

     
 
-15
-16
-17
 18
 19
 20
@@ -288,10 +339,19 @@ considered a puppet agent.
    
 34
 35
 36
-37
    +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 - 
    # File 'manifests/params.pp', line 15
+        
    # File 'manifests/params.pp', line 18
 
 class puppet_cd::params (
 
@@ -306,11 +366,17 @@ class puppet_cd::params (
   String $pt_server_pkg     = 'puppetserver',
   Array $pt_db_pkg          = ['puppetdb','puppetdb-termini'],
 
+  String $pt_no_ssl_port    = '8080',
+  String $pt_ssl_port       = '8081',
+  Boolean $pt_use_ssl_only  = true,
+
 ) {
   $fqdn                     = $facts['networking']['fqdn']
 
 # service
-  $pt_service               = 'puppetserver'
+  $pt_server_service        = 'puppetserver'
+  $pt_agent_service         = 'puppet'
+  $pt_db_service            = 'puppetdb'
 
 #
   # includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
index e1a7e89..20d505c 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -119,7 +119,25 @@
 21
 22
 23
-24
    
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
    # File 'manifests/server/service.pp', line 6
@@ -127,15 +145,33 @@
 class puppet_cd::server::service (
 
 ) inherits puppet_cd::params {
+  require puppet_cd::main::files
+
+  # manage agent service on all nodes
+  service { $pt_agent_service:
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
+  }
+
+  # manage puppet server service
   if $fqdn == $pt_pm_fqdn {
-    # manager requirement
-
     require puppet_cd::firewall::iptables
-    require puppet_cd::main::files
 
-    # manage puppet server service
+    service { $pt_server_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
 
-    service { $pt_service:
+  # manage puppetdb service
+  if $fqdn == $pt_db_fqdn {
+    require puppet_cd::firewall::iptables
+
+    service { $pt_db_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,