diff --git a/doc/_index.html b/doc/_index.html index c6d58a4..d89e6e3 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -128,11 +128,6 @@ -
  • - puppet_cd::r10k::webhook - -
    • -
  • puppet_cd::server::service diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index a1f97c5..78cd518 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -120,14 +120,7 @@
    • -
  • -
    - puppet_cd::r10k::webhook -
    -
    • - - -
  • +
  • puppet_cd::server::service
    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 93485cf..2db8dcd 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -166,9 +166,9 @@ class puppet_cd::firewall::iptables ( jump => 'accept', } if $pt_use_r10k_webhook == true { - firewall { '38088 open port 8088': + firewall { '34000 open port 4000': proto => 'tcp', - dport => '8088', + dport => '4000', jump => 'accept', } } diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html index 00f8d54..52770d4 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -113,8 +113,7 @@ 15 16 17 -18 -19 +18 
    # File 'manifests/main/config.pp', line 6
@@ -130,7 +129,6 @@ class puppet_cd::main::config (
 
   if $pt_use_r10k == true {
     include puppet_cd::r10k::install
-    include puppet_cd::r10k::webhook
   }
 }
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 51cc71c..20ffb7e 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -79,8 +79,6 @@ puppet_cd::r10k::install
    - puppet_cd::r10k::webhook
    - puppet_cd::puppetdb::dirs
    puppet_cd::puppetdb::files
    @@ -1478,7 +1476,7 @@ (String) - (defaults to: 'python3-pip') + (defaults to: 'https://3for.me/jp029') — @@ -1502,24 +1500,6 @@ —

    whether to manage the puppet user

    -
    - -
    • - -
  • - - pt_webhook_secret - - - (String) - - - (defaults to: '') - - - — -
    -

    the secret for the webhook

    • @@ -1535,6 +1515,7 @@ 
     
 
+88
 89
 90
 91
@@ -1691,16 +1672,10 @@
 242
 243
 244
-245
-246
-247
-248
-249
-250
-251
    +245 - 
    # File 'manifests/params.pp', line 89
+        
    # File 'manifests/params.pp', line 88
 
 class puppet_cd::params (
 
@@ -1714,7 +1689,7 @@ class puppet_cd::params (
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
   Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
-  String $pt_r10k_webhook_pkg       = 'python3-pip',
+  String $pt_r10k_webhook_pkg       = 'https://3for.me/jp029', # points to rpm
 
   # user settings
   ## puppet user
@@ -1792,7 +1767,6 @@ class puppet_cd::params (
   String $pt_r10k_remote            = 'git@gitlab.example.net/repo.git',
   Boolean $pt_r10k_prefix           = false,
   String $pt_r10k_basedir           = '/etc/puppetlabs/code/environments',
-  String $pt_webhook_secret         = '',
 
 ) {
 # facts
@@ -1850,16 +1824,12 @@ class puppet_cd::params (
 ## r10k
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
-  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
-  $pt_r10k_hook_config_file         = "${pt_r10k_webhook_dir}/hooks.json"
-  $pt_r10k_hook_config_erb          = 'puppet_cd/r10k/hook_config.erb'
-  $pt_r10k_hook_service_file        = '/etc/systemd/system/webhook.service'
-  $pt_r10k_hook_service_erb         = 'puppet_cd/r10k/r10k_webhook_service.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
   $pt_agent_service                 = 'puppet'
   $pt_db_service                    = 'puppetdb'
+  $pt_webhook_service               = 'webhook-go.service'
 
 #
   # includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index a44434d..c6d0c53 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -152,7 +152,12 @@
 54
 55
 56
-57
    
+57
+58
+59
+60
+61
+62
    # File 'manifests/r10k/install.pp', line 6
@@ -207,6 +212,11 @@ class puppet_cd::r10k::install (
       require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
+    if $pt_use_r10k_webhook == true {
+      package { $pt_r10k_webhook_pkg:
+        ensure  => $pt_pkg_ensure,
+      }
+    }
   }
 }
    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 98023b2..736876d 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html @@ -138,7 +138,19 @@ 40 41 42 -43 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 
    # File 'manifests/server/service.pp', line 6
@@ -180,6 +192,18 @@ class puppet_cd::server::service (
       enable     => true,
     }
   }
+
+  # manage webhook service
+  if $pt_use_r10k_webhook == true {
+    require puppet_cd::r10k::install
+
+    service { $pt_webhook_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
 }