diff --git a/doc/_index.html b/doc/_index.html index 882afe2..6b8c1d8 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -98,11 +98,6 @@ -
  • - puppet_cd::main::user - -
  • -
  • puppet_cd::params diff --git a/doc/file.README.html b/doc/file.README.html index 4de8ff0..3398d3c 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -75,18 +75,41 @@

    Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production

    Features

    + +

    Puppet server and agent

    + +

    R10k service (optional)

    + + +

    R10k Web hook

    + + +

    Puppetdb

    + + +

    Firewall

    + + +

    Directories, Files and Services,

    +

    Support

    diff --git a/doc/index.html b/doc/index.html index 07cf126..243777b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -75,18 +75,41 @@

    Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production

    Features

    + +

    Puppet server and agent

    + +

    R10k service (optional)

    + + +

    R10k Web hook

    + + +

    Puppetdb

    + + +

    Firewall

    + + +

    Directories, Files and Services,

    +

    Support

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index e46539b..1549083 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -78,28 +78,21 @@
  • -
  • -
    - puppet_cd::main::user -
    -
  • - - -
  • +
  • puppet_cd::params
  • -
  • +
  • puppet_cd::r10k::install
  • -
  • +
  • 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 9325b0c..e0d7c5d 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -124,7 +124,14 @@ 26 27 28 -29 +29 +30 +31 +32 +33 +34 +35 +36
    # File 'manifests/firewall/iptables.pp', line 6
    @@ -152,6 +159,13 @@ class puppet_cd::firewall::iptables (
           }
         }
       }
    +  if ($pt_puppetdb_fqdn == $fqdn) and ($pt_use_puppetdb == true) {
    +    firewall { "3${pt_https_port} open port ${pt_https_port}":
    +      proto => 'tcp',
    +      dport => $pt_https_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 befc8fd..80793e0 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -214,7 +214,7 @@ class puppet_cd::main::files ( group => 'root', mode => '0550', selrole => object_r, - seltype => foreman_enc_t, + seltype => puppet_etc_t, seluser => system_u, content => template($pt_node_rb_erb), } diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 0ce6603..93191ca 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -69,8 +69,6 @@ puppet_cd::main::dirs
    - puppet_cd::main::user
    - puppet_cd::main::files
    puppet_cd::main::config
    @@ -240,13 +238,13 @@
  • - pt_server_pkg + pt_puppetdb_pkg - (String) + (Array) - (defaults to: 'puppetserver') + (defaults to: ['puppetdb-termini', 'puppetdb']) — @@ -274,78 +272,6 @@
  • -
  • - - pt_user - - - (String) - - - (defaults to: 'puppet') - - - — -
    -

    the puppet user

    -
    - -
  • - -
  • - - pt_user_comment - - - (String) - - - (defaults to: 'puppetserver daemon') - - - — -
    -

    the user comment

    -
    - -
  • - -
  • - - pt_user_home - - - (String) - - - (defaults to: '/opt/puppetlabs/server/data/puppetserver') - - - — -
    -

    the user home

    -
    - -
  • - -
  • - - pt_user_shell - - - (String) - - - (defaults to: '/sbin/nologin') - - - — -
    -

    the user shell

    -
    - -
  • -
  • pt_environment @@ -940,24 +866,6 @@
  • -
  • - - pt_manage_user - - - (Boolean) - - - (defaults to: false) - - - — -
    -

    whether to manage the puppet user

    -
    - -
  • -
  • pt_r10k_webhook_port @@ -1014,15 +922,182 @@
  • - pt_puppetdb_pkg + pt_db_subname (String) - (defaults to: 'puppetdb-termini') + (defaults to: '//localhost:5432/puppetdb') + — +
    +

    the url for the database connection

    +
    + +
  • + +
  • + + pt_db_username + + + (String) + + + (defaults to: 'foobar') + + + — +
    +

    the username for the database connection

    +
    + +
  • + +
  • + + pt_db_password + + + (String) + + + (defaults to: 'foobar') + + + — +
    +

    the password for the database connection

    +
    + +
  • + +
  • + + pt_gc_interval + + + (String) + + + (defaults to: '60') + + + — +
    +

    How often (in minutes) to compact the database

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

    Port to listen on for clear-text HTTP.

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

    Port to listen on for HTTPs connections.

    +
    + +
  • + +
  • + + pt_ssl_host + + + (String) + + + (defaults to: '0.0.0.0') + + + — +
    +

    IP address to listen on for HTTPS connections

    +
    + +
  • + +
  • + + pt_repl_on + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    toggle the remote repl true false

    +
    + +
  • + +
  • + + pt_repl_port + + + (String) + + + (defaults to: '8082') + + + — +
    +

    What port the REPL should listen on

    +
    + +
  • + +
  • + + pt_repl_host + + + (String) + + + (defaults to: '127.0.0.1') + + + — +
    +

    IP address to listen on

    +
    +
  • @@ -1036,11 +1111,6 @@
     
     
    -59
    -60
    -61
    -62
    -63
     64
     65
     66
    @@ -1152,10 +1222,19 @@
     172
     173
     174
    -175
    +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 -
    # File 'manifests/params.pp', line 59
    +        
    # File 'manifests/params.pp', line 64
     
     class puppet_cd::params (
     
    @@ -1168,18 +1247,10 @@ class puppet_cd::params (
       String $pt_pkg_ensure             = 'present',
       String $pt_agent_pkg              = 'puppet-agent',
       String $pt_server_pkg             = 'puppetserver',
    -  String $pt_puppetdb_pkg           = 'puppetdb-termini',
    +  Array $pt_puppetdb_pkg            = ['puppetdb-termini', 'puppetdb'],
       Array $pt_r10k_pkg                = ['ruby','ruby-devel','rubygems','gcc','make'],
       Array $pt_r10k_webhook_pkg        = ['webrick', 'r10k_gitlab_webhook'],
     
    -  # user settings
    -  ## puppet user
    -  Boolean $pt_manage_user           = false,
    -  String $pt_user                   = 'puppet',
    -  String $pt_user_comment           = 'puppetserver daemon',
    -  String $pt_user_home              = '/opt/puppetlabs/server/data/puppetserver',
    -  String $pt_user_shell             = '/sbin/nologin',
    -
       # templates
       ## puppet
       String $pt_environment            = 'production',
    @@ -1213,6 +1284,18 @@ class puppet_cd::params (
     # puppetdb
       String $pt_ssl_port               = '8081',
       Boolean $pt_soft_write_failure    = false,
    +  String $pt_db_subname             = '//localhost:5432/puppetdb',
    +  String $pt_db_username            = 'foobar',
    +  String $pt_db_password            = 'foobar',
    +  String $pt_gc_interval            = '60',
    +  ## jetty
    +  String $pt_http_port              = '8080',
    +  String $pt_https_port             = '8081',
    +  String $pt_ssl_host               = '0.0.0.0',
    +  ## repl
    +  Boolean $pt_repl_on               = false,
    +  String $pt_repl_port              = '8082',
    +  String $pt_repl_host              = '127.0.0.1',
     
     # r10k
       Boolean $pt_use_r10k              = false,
    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 6fa6039..c1af0f2 100644
    --- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
    +++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
    @@ -137,7 +137,17 @@
     39
     40
     41
    -42
    +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52
    # File 'manifests/server/service.pp', line 6
    @@ -158,7 +168,6 @@ class puppet_cd::server::service (
       # manage puppet server service
       if $fqdn == $pt_pm_fqdn {
         require puppet_cd::firewall::iptables
    -    require puppet_cd::main::user
     
         service { $pt_server_service:
           ensure     => running,
    @@ -166,12 +175,23 @@ class puppet_cd::server::service (
           hasrestart => true,
           enable     => true,
         }
    +    # manage webhook service
    +    if $pt_use_r10k_webhook == true {
    +      require puppet_cd::r10k::install
    +
    +      service { $pt_r10k_webhook_service:
    +        ensure     => running,
    +        hasstatus  => true,
    +        hasrestart => true,
    +        enable     => true,
    +      }
    +    }
       }
     
    -  # manage webhook service
    -  if $pt_use_r10k_webhook == true {
    -    require puppet_cd::r10k::install
    -    service { $pt_r10k_webhook_service:
    +  if ($pt_use_puppetdb == true) and ($pt_puppetdb_fqdn == $fqdn) {
    +    require puppet_cd::firewall::iptables
    +
    +    service { $pt_db_service:
           ensure     => running,
           hasstatus  => true,
           hasrestart => true,