diff --git a/doc/_index.html b/doc/_index.html index d89e6e3..9ec1e15 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,11 +73,6 @@ -
  • - puppet_cd::firewall::iptables - -
    • -
  • puppet_cd::main::config @@ -103,11 +98,6 @@
    • -
  • - puppet_cd::params - -
    • -
  • puppet_cd::puppetdb::dirs diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 78cd518..5cdd80e 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -43,55 +43,41 @@
    • -
  • -
    - puppet_cd::firewall::iptables -
    -
    • - - -
  • +
  • puppet_cd::main::config
    • -
  • +
  • puppet_cd::main::dirs
    • -
  • +
  • puppet_cd::main::files
    • -
  • +
  • puppet_cd::main::install
    • -
  • +
  • puppet_cd::main::user
    • -
  • -
    - puppet_cd::params -
    -
    • - -
  • puppet_cd::puppetdb::dirs 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 52770d4..be28782 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html index 2f6fb4d..ac7901f 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    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 9491674..1f5d6e1 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html index 292829a..ddfa784 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html index 94ec425..82be101 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html index b0c25f1..70e2765 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html index 5f82142..0ee5134 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html index 70af012..77e9942 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    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 828aff0..c45414b 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -64,7 +64,7 @@
    Inherits:
    -
    puppet_cd::params
    +
    puppet_cd::params
    @@ -164,7 +164,29 @@ 66 67 68 -69 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 
    # File 'manifests/r10k/install.pp', line 6
@@ -191,6 +213,7 @@ class puppet_cd::r10k::install (
     package { 'r10k':
       ensure   => $pt_pkg_ensure,
       provider => gem,
+      require  => Package[$pt_r10k_pkg],
     }
 
     # create r10k dir
@@ -219,16 +242,37 @@ class puppet_cd::r10k::install (
       require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
+
     if $pt_use_r10k_webhook == true {
-      file { $pt_r10k_webhook_pkg:
-        ensure => file,
-        source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
+      package { $pt_r10k_webhook_pkg:
+        ensure   => present,
+        provider => gem,
+        require  => Package[$pt_r10k_pkg],
       }
 
-      exec { 'install rpm':
-        command => "yum install -y ${pt_r10k_webhook_pkg}",
-        unless  => 'rpm -qa | grep webhook-go',
-        require => File[$pt_r10k_webhook_pkg],
+      exec { 'create symlink':
+        command => $pt_webhook_link,
+        creates => '/usr/bin/r10k_gitlab_webhook',
+        path    => ['/bin', '/usr/bin'],
+        require => Package[$pt_r10k_webhook_pkg],
+      }
+
+      file { $pt_webhook_service_file:
+        ensure   => file,
+        owner    => 'root',
+        group    => 'root',
+        mode     => '0664',
+        selrange => s0,
+        selrole  => object_r,
+        seltype  => puppet_etc_t,
+        seluser  => unconfined_u,
+        content  => template($pt_webhook_service_erb),
+        notify   => [Service[$pt_r10k_webhook_service],Exec['systemctl-daemon-reload']],
+      }
+
+      exec { 'systemctl-daemon-reload':
+        command     => '/bin/systemctl daemon-reload',
+        refreshonly => true,
       }
     }
   }
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 736876d..0ae173d 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
@@ -149,8 +149,7 @@
 51
 52
 53
-54
-55
    +54 
    # File 'manifests/server/service.pp', line 6
@@ -196,8 +195,7 @@ class puppet_cd::server::service (
   # manage webhook service
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install
-
-    service { $pt_webhook_service:
+    service { $pt_r10k_webhook_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,