Skip to content
This repository was archived by the owner on Jun 11, 2019. It is now read-only.

minor feature additions #30

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

minor feature additions #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d7e41d
added the ability to manage the sysconfig / default file
mburger Jun 1, 2014
ce72b2d
added the ability to create a replication user
mburger Jun 1, 2014
55438ba
OPS-5255 - fixed postgresql::dbcreate
mburger Jun 10, 2014
0c1eb49
depend on service not package in postgresql::role
mburger Aug 7, 2014
fee2411
OPS-6111 - added cwd to exec resource
Aug 20, 2014
e43278e
lint fixes
mburger Aug 21, 2014
ceedc89
Revert "OPS-6111 - added cwd to exec resource"
mburger Aug 25, 2014
0d96640
added the ability to create superuser accounts with dbcreate
mburger Dec 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions manifests/dbcreate.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
$conntype = 'host',
$address = '127.0.0.1/32',
$auth_method = 'md5',
$auth_options = '') {
$auth_options = '',
$superuser = false) {
include postgresql

$bool_superuser = any2bool($superuser)

$real_template = $template ? {
'' => $postgresql::version ? {
'9.3' => 'template0',
Expand All @@ -21,11 +24,16 @@
default => $template,
}

$o_superuser = $bool_superuser ? {
true => 'SUPERUSER',
false => 'NOSUPERUSER',
}

exec { "role_${name}":
user => $postgresql::process_user,
path => '/usr/bin:/bin:/usr/sbin:/sbin',
unless => "echo \\\\dg | psql | grep ${role} 2>/dev/null",
command => "echo \"create role \\\"${role}\\\" nosuperuser nocreatedb nocreaterole noinherit nologin ; alter role \\\"${role}\\\" nosuperuser nocreatedb nocreaterole noinherit login encrypted password '${password}'; grant ${name} to \\\"${role}\\\";\" | /usr/bin/psql",
command => "echo \"create role \\\"${role}\\\" ${o_superuser} nocreatedb nocreaterole noinherit nologin ; alter role \\\"${role}\\\" ${o_superuser} nocreatedb nocreaterole noinherit login encrypted password '${password}'; grant \\\"${name}\\\" to \\\"${role}\\\";\" | /usr/bin/psql",
require => [Service['postgresql']],
} -> exec { "db_${name}":
user => $postgresql::process_user,
Expand Down
159 changes: 102 additions & 57 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@
# [*config_file_init*]
# Path of configuration file sourced by init script
#
# [*config_file_init_source*]
# Source for the configuration file sourced by the init script
#
# [*config_file_init_template*]
# Template for the configuration file sourced by the init script
#
# [*pid_file*]
# Path of pid file. Used by monitor
#
Expand Down Expand Up @@ -244,56 +250,58 @@
# Alessandro Franceschi <[email protected]/>
#
class postgresql (
$use_postgresql_repo = params_lookup( 'use_postgresql_repo' ),
$install_prerequisites = params_lookup( 'install_prerequisites' ),
$initdbcommand = params_lookup( 'initdbcommand' ),
$config_file_hba = params_lookup( 'config_file_hba' ),
$source_hba = params_lookup( 'source_hba' ),
$template_hba = params_lookup( 'template_hba' ),
$template_hba_header = params_lookup( 'template_hba_header' ),
$template_hba_footer = params_lookup( 'template_hba_footer' ),
$template_ident = params_lookup( 'template_ident' ),
$template_ident_header = params_lookup( 'template_ident_header' ),
$my_class = params_lookup( 'my_class' ),
$source = params_lookup( 'source' ),
$source_dir = params_lookup( 'source_dir' ),
$source_dir_purge = params_lookup( 'source_dir_purge' ),
$template = params_lookup( 'template' ),
$service_autorestart = params_lookup( 'service_autorestart' , 'global' ),
$options = params_lookup( 'options' ),
$version = params_lookup( 'version' ),
$absent = params_lookup( 'absent' ),
$disable = params_lookup( 'disable' ),
$disableboot = params_lookup( 'disableboot' ),
$monitor = params_lookup( 'monitor' , 'global' ),
$monitor_tool = params_lookup( 'monitor_tool' , 'global' ),
$monitor_target = params_lookup( 'monitor_target' , 'global' ),
$puppi = params_lookup( 'puppi' , 'global' ),
$puppi_helper = params_lookup( 'puppi_helper' , 'global' ),
$firewall = params_lookup( 'firewall' , 'global' ),
$firewall_tool = params_lookup( 'firewall_tool' , 'global' ),
$firewall_src = params_lookup( 'firewall_src' , 'global' ),
$firewall_dst = params_lookup( 'firewall_dst' , 'global' ),
$debug = params_lookup( 'debug' , 'global' ),
$audit_only = params_lookup( 'audit_only' , 'global' ),
$package = params_lookup( 'package' ),
$service = params_lookup( 'service' ),
$service_status = params_lookup( 'service_status' ),
$process = params_lookup( 'process' ),
$process_args = params_lookup( 'process_args' ),
$process_user = params_lookup( 'process_user' ),
$config_dir = params_lookup( 'config_dir' ),
$config_file = params_lookup( 'config_file' ),
$config_file_mode = params_lookup( 'config_file_mode' ),
$config_file_owner = params_lookup( 'config_file_owner' ),
$config_file_group = params_lookup( 'config_file_group' ),
$config_file_init = params_lookup( 'config_file_init' ),
$pid_file = params_lookup( 'pid_file' ),
$data_dir = params_lookup( 'data_dir' ),
$log_dir = params_lookup( 'log_dir' ),
$log_file = params_lookup( 'log_file' ),
$port = params_lookup( 'port' ),
$protocol = params_lookup( 'protocol' )
$use_postgresql_repo = params_lookup( 'use_postgresql_repo' ),
$install_prerequisites = params_lookup( 'install_prerequisites' ),
$initdbcommand = params_lookup( 'initdbcommand' ),
$config_file_hba = params_lookup( 'config_file_hba' ),
$source_hba = params_lookup( 'source_hba' ),
$template_hba = params_lookup( 'template_hba' ),
$template_hba_header = params_lookup( 'template_hba_header' ),
$template_hba_footer = params_lookup( 'template_hba_footer' ),
$template_ident = params_lookup( 'template_ident' ),
$template_ident_header = params_lookup( 'template_ident_header' ),
$my_class = params_lookup( 'my_class' ),
$source = params_lookup( 'source' ),
$source_dir = params_lookup( 'source_dir' ),
$source_dir_purge = params_lookup( 'source_dir_purge' ),
$template = params_lookup( 'template' ),
$service_autorestart = params_lookup( 'service_autorestart' , 'global' ),
$options = params_lookup( 'options' ),
$version = params_lookup( 'version' ),
$absent = params_lookup( 'absent' ),
$disable = params_lookup( 'disable' ),
$disableboot = params_lookup( 'disableboot' ),
$monitor = params_lookup( 'monitor' , 'global' ),
$monitor_tool = params_lookup( 'monitor_tool' , 'global' ),
$monitor_target = params_lookup( 'monitor_target' , 'global' ),
$puppi = params_lookup( 'puppi' , 'global' ),
$puppi_helper = params_lookup( 'puppi_helper' , 'global' ),
$firewall = params_lookup( 'firewall' , 'global' ),
$firewall_tool = params_lookup( 'firewall_tool' , 'global' ),
$firewall_src = params_lookup( 'firewall_src' , 'global' ),
$firewall_dst = params_lookup( 'firewall_dst' , 'global' ),
$debug = params_lookup( 'debug' , 'global' ),
$audit_only = params_lookup( 'audit_only' , 'global' ),
$package = params_lookup( 'package' ),
$service = params_lookup( 'service' ),
$service_status = params_lookup( 'service_status' ),
$process = params_lookup( 'process' ),
$process_args = params_lookup( 'process_args' ),
$process_user = params_lookup( 'process_user' ),
$config_dir = params_lookup( 'config_dir' ),
$config_file = params_lookup( 'config_file' ),
$config_file_mode = params_lookup( 'config_file_mode' ),
$config_file_owner = params_lookup( 'config_file_owner' ),
$config_file_group = params_lookup( 'config_file_group' ),
$config_file_init = params_lookup( 'config_file_init' ),
$config_file_init_source = params_lookup( 'config_file_init_source' ),
$config_file_init_template = params_lookup( 'config_file_init_template' ),
$pid_file = params_lookup( 'pid_file' ),
$data_dir = params_lookup( 'data_dir' ),
$log_dir = params_lookup( 'log_dir' ),
$log_file = params_lookup( 'log_file' ),
$port = params_lookup( 'port' ),
$protocol = params_lookup( 'protocol' )
) inherits postgresql::params {

$bool_use_postgresql_repo=any2bool($use_postgresql_repo)
Expand Down Expand Up @@ -374,19 +382,14 @@
default => $postgresql::source,
}

$manage_file_content = $postgresql::template ? {
'' => undef,
default => template($postgresql::template),
}

$manage_file_source_hba = $postgresql::source_hba ? {
'' => undef,
default => $postgresql::source_hba,
}

$manage_file_content_hba = $postgresql::template_hba ? {
$manage_config_file_init_source = $postgresql::config_file_init_source ? {
'' => undef,
default => template($postgresql::template_hba),
default => $postgresql::config_file_init_source,
}

### Calculation of internal variables according to user input
Expand Down Expand Up @@ -491,6 +494,31 @@
default => $postgresql::log_file,
}

$real_config_file_init = $postgresql::config_file_init ? {
'' => $::operatingsystem ? {
/(?i:Debian|Ubuntu|Mint)/ => '/etc/default/postgresql',
default => "/etc/sysconfig/pgsql/postgresql-${real_version}",
},
default => $postgresql::config_file_init,
}

# since we might depend on calculated vars, place the templates here
$manage_config_file_init_template = $postgresql::config_file_init_template ? {
'' => undef,
default => template($postgresql::config_file_init_template),
}

$manage_file_content = $postgresql::template ? {
'' => undef,
default => template($postgresql::template),
}

$manage_file_content_hba = $postgresql::template_hba ? {
'' => undef,
default => template($postgresql::template_hba),
}


### Managed resources

if $postgresql::bool_install_prerequisites {
Expand Down Expand Up @@ -541,6 +569,23 @@
}
}

if ($postgresql::config_file_init_source or $postgresql::config_file_init_template) {
file { 'postgresql.init.conf':
ensure => $postgresql::manage_file,
path => $postgresql::real_config_file_init,
mode => $postgresql::config_file_mode,
owner => $postgresql::config_file_owner,
group => $postgresql::config_file_group,
require => Package['postgresql'],
notify => $postgresql::manage_service_autorestart,
source => $postgresql::manage_config_file_init_source,
content => $postgresql::manage_config_file_init_template,
replace => $postgresql::manage_file_replace,
audit => $postgresql::manage_audit,
noop => $postgresql::noops,
}
}


# The whole postgresql configuration directory can be recursively overriden
if $postgresql::source_dir {
Expand Down
7 changes: 3 additions & 4 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@
default => 'postgres',
}

$config_file_init = $::operatingsystem ? {
/(?i:Debian|Ubuntu|Mint)/ => '/etc/default/postgresql',
default => '/etc/sysconfig/pgsql',
}
$config_file_init = ''

$pid_file = ''

Expand All @@ -101,6 +98,8 @@
$absent = false
$disable = false
$disableboot = false
$config_file_init_source = ''
$config_file_init_template = ''

### General module variables that can have a site or per module default
$monitor = false
Expand Down
24 changes: 15 additions & 9 deletions manifests/role.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@
# }
#
define postgresql::role(
$rolename = $name,
$superuser = false,
$createrole = false,
$createdb = false,
$login = true,
$password = '',
$absent = false
$rolename = $name,
$superuser = false,
$createrole = false,
$createdb = false,
$replication = false,
$login = true,
$password = '',
$absent = false
) {

include 'postgresql'
Expand All @@ -66,6 +67,7 @@
$bool_superuser = any2bool($superuser)
$bool_createrole = any2bool($createrole)
$bool_createbd = any2bool($createdb)
$bool_replication = any2bool($replication)
$bool_login = any2bool($login)

$initial_query = "CREATE ROLE \\\"$rolename\\\""
Expand All @@ -82,6 +84,10 @@
true => 'CREATEDB',
false => 'NOCREATEDB',
}
$o_replication = $bool_replication ? {
true => 'REPLICATION',
false => 'NOREPLICATION',
}
$o_login = $bool_login ? {
true => 'LOGIN',
false => 'NOLOGIN',
Expand All @@ -90,7 +96,7 @@
'' => '',
default => "ENCRYPTED PASSWORD '${password}'",
}
$opts = "$o_superuser $o_createrole $o_createdb $o_login $o_password"
$opts = "$o_superuser $o_createrole $o_createdb $o_replication $o_login $o_password"
$create_query = "$initial_query $opts;"
$drop_query = "DROP ROLE \\\"${rolename}\\\""

Expand All @@ -107,7 +113,7 @@
true => $cmd,
false => undef,
}
$db_require = Package['postgresql']
$db_require = Service['postgresql']

exec { "postgres-manage-role-${name}":
user => $postgresql::process_user,
Expand Down