From 32819a61fbb00e53acd1a1088a6c21a00bf8b84b Mon Sep 17 00:00:00 2001 From: Philippe BEAUMONT Date: Fri, 15 Jun 2018 16:01:53 +0200 Subject: [PATCH 1/3] Add support for freebsd --- manifests/config.pp | 25 +++++++++++++++++++------ manifests/service.pp | 26 ++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index b7c74fe..cc0386e 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -49,9 +49,9 @@ } $defaults_dir = $::osfamily ? { - /RedHat/ => '/etc/sysconfig', - /Debian/ => '/etc/default', - default => '/etc/sysconfig', + /RedHat/ => '/etc/sysconfig', + /Debian/ => '/etc/default', + default => '/etc/sysconfig', } $pgpool_sysconfig_file = "${defaults_dir}/${::pgpool::service::pgpool_service_name}" @@ -60,6 +60,7 @@ $pcp_file = "${config_dir}/pcp.conf" $pool_hba_file = "${config_dir}/pool_hba.conf" $log_dir = "/var/log/${::pgpool::service::pgpool_service_name}" + $pid_dir = '/var/run/pgpool' File { owner => $::pgpool::service_user, @@ -80,9 +81,11 @@ notify => Exec['pgpool_reload'] } - file { $pgpool_sysconfig_file: - ensure => $::pgpool::file_ensure, - notify => Service['pgpool'] + if $::osfamily !~ /BSD/ { + file { $pgpool_sysconfig_file: + ensure => $::pgpool::file_ensure, + notify => Service['pgpool'] + } } file { $pool_passwd_file: @@ -105,4 +108,14 @@ owner => $::pgpool::log_user, group => $::pgpool::log_group, } + + if $::osfamily == 'FreeBSD' { + file { $pid_dir: + ensure => directory, + path => $pid_dir, + owner => $::pgpool::log_user, + group => $::pgpool::log_group, + mode => '0755', + } + } } diff --git a/manifests/service.pp b/manifests/service.pp index b98e501..ad177e1 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -36,10 +36,28 @@ $pgpool_service_name = $::pgpool::service_name_real - service { 'pgpool': - ensure => $::pgpool::service_ensure_real, - name => $pgpool_service_name, - enable => $::pgpool::service_enable_real + if $::osfamily == 'FreeBSD' { + $service_enable = $::pgpool::service_enable_real ? { + false => 'NO', + default => 'YES', + } + file { '/etc/rc.conf.d/pgpool': + owner => 'root', + group => 'wheel', + mode => '0644', + content => "pgpool_enable=\"${service_enable}\"\npgpool_user=\"${::pgpool::service_user}\"\n", + } + service { 'pgpool': + ensure => $::pgpool::service_ensure_real, + name => $pgpool_service_name, + } + } + else { + service { 'pgpool': + ensure => $::pgpool::service_ensure_real, + name => $pgpool_service_name, + enable => $::pgpool::service_enable_real + } } exec { 'pgpool_reload': From c9daec0af6439d790476a89d88f2e21e812f130f Mon Sep 17 00:00:00 2001 From: Philippe BEAUMONT Date: Fri, 15 Jun 2018 16:05:03 +0200 Subject: [PATCH 2/3] Revert "Add support for freebsd" This reverts commit 32819a61fbb00e53acd1a1088a6c21a00bf8b84b. --- manifests/config.pp | 25 ++++++------------------- manifests/service.pp | 26 ++++---------------------- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index cc0386e..b7c74fe 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -49,9 +49,9 @@ } $defaults_dir = $::osfamily ? { - /RedHat/ => '/etc/sysconfig', - /Debian/ => '/etc/default', - default => '/etc/sysconfig', + /RedHat/ => '/etc/sysconfig', + /Debian/ => '/etc/default', + default => '/etc/sysconfig', } $pgpool_sysconfig_file = "${defaults_dir}/${::pgpool::service::pgpool_service_name}" @@ -60,7 +60,6 @@ $pcp_file = "${config_dir}/pcp.conf" $pool_hba_file = "${config_dir}/pool_hba.conf" $log_dir = "/var/log/${::pgpool::service::pgpool_service_name}" - $pid_dir = '/var/run/pgpool' File { owner => $::pgpool::service_user, @@ -81,11 +80,9 @@ notify => Exec['pgpool_reload'] } - if $::osfamily !~ /BSD/ { - file { $pgpool_sysconfig_file: - ensure => $::pgpool::file_ensure, - notify => Service['pgpool'] - } + file { $pgpool_sysconfig_file: + ensure => $::pgpool::file_ensure, + notify => Service['pgpool'] } file { $pool_passwd_file: @@ -108,14 +105,4 @@ owner => $::pgpool::log_user, group => $::pgpool::log_group, } - - if $::osfamily == 'FreeBSD' { - file { $pid_dir: - ensure => directory, - path => $pid_dir, - owner => $::pgpool::log_user, - group => $::pgpool::log_group, - mode => '0755', - } - } } diff --git a/manifests/service.pp b/manifests/service.pp index ad177e1..b98e501 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -36,28 +36,10 @@ $pgpool_service_name = $::pgpool::service_name_real - if $::osfamily == 'FreeBSD' { - $service_enable = $::pgpool::service_enable_real ? { - false => 'NO', - default => 'YES', - } - file { '/etc/rc.conf.d/pgpool': - owner => 'root', - group => 'wheel', - mode => '0644', - content => "pgpool_enable=\"${service_enable}\"\npgpool_user=\"${::pgpool::service_user}\"\n", - } - service { 'pgpool': - ensure => $::pgpool::service_ensure_real, - name => $pgpool_service_name, - } - } - else { - service { 'pgpool': - ensure => $::pgpool::service_ensure_real, - name => $pgpool_service_name, - enable => $::pgpool::service_enable_real - } + service { 'pgpool': + ensure => $::pgpool::service_ensure_real, + name => $pgpool_service_name, + enable => $::pgpool::service_enable_real } exec { 'pgpool_reload': From 5bb4e33c442cdd5d5df27c92f32895d85086d08e Mon Sep 17 00:00:00 2001 From: Philippe BEAUMONT Date: Fri, 15 Jun 2018 16:06:34 +0200 Subject: [PATCH 3/3] Add support for freebsd --- manifests/config.pp | 19 ++++++++++++++++--- manifests/service.pp | 26 ++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index b7c74fe..5f83fac 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -60,6 +60,7 @@ $pcp_file = "${config_dir}/pcp.conf" $pool_hba_file = "${config_dir}/pool_hba.conf" $log_dir = "/var/log/${::pgpool::service::pgpool_service_name}" + $pid_dir = '/var/run/pgpool' File { owner => $::pgpool::service_user, @@ -80,9 +81,11 @@ notify => Exec['pgpool_reload'] } - file { $pgpool_sysconfig_file: - ensure => $::pgpool::file_ensure, - notify => Service['pgpool'] + if $::osfamily !~ /BSD/ { + file { $pgpool_sysconfig_file: + ensure => $::pgpool::file_ensure, + notify => Service['pgpool'] + } } file { $pool_passwd_file: @@ -105,4 +108,14 @@ owner => $::pgpool::log_user, group => $::pgpool::log_group, } + + if $::osfamily == 'FreeBSD' { + file { $pid_dir: + ensure => directory, + path => $pid_dir, + owner => $::pgpool::log_user, + group => $::pgpool::log_group, + mode => '0755', + } + } } diff --git a/manifests/service.pp b/manifests/service.pp index b98e501..ad177e1 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -36,10 +36,28 @@ $pgpool_service_name = $::pgpool::service_name_real - service { 'pgpool': - ensure => $::pgpool::service_ensure_real, - name => $pgpool_service_name, - enable => $::pgpool::service_enable_real + if $::osfamily == 'FreeBSD' { + $service_enable = $::pgpool::service_enable_real ? { + false => 'NO', + default => 'YES', + } + file { '/etc/rc.conf.d/pgpool': + owner => 'root', + group => 'wheel', + mode => '0644', + content => "pgpool_enable=\"${service_enable}\"\npgpool_user=\"${::pgpool::service_user}\"\n", + } + service { 'pgpool': + ensure => $::pgpool::service_ensure_real, + name => $pgpool_service_name, + } + } + else { + service { 'pgpool': + ensure => $::pgpool::service_ensure_real, + name => $pgpool_service_name, + enable => $::pgpool::service_enable_real + } } exec { 'pgpool_reload':