From 9134c7fab665956213f17e2a042f53a4696b343c Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 13 Dec 2013 11:30:58 +0100 Subject: [PATCH] Enable password authentication for PostgreSQL resolves #5264 --- .vagrant-puppet/modules/icinga2/manifests/init.pp | 3 ++- .../modules/pgsql/templates/pg_hba.conf.erb | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.vagrant-puppet/modules/icinga2/manifests/init.pp b/.vagrant-puppet/modules/icinga2/manifests/init.pp index f3f3177de..822bb4cac 100644 --- a/.vagrant-puppet/modules/icinga2/manifests/init.pp +++ b/.vagrant-puppet/modules/icinga2/manifests/init.pp @@ -82,8 +82,9 @@ class icinga2-ido-pgsql { exec { 'populate-icinga2-ido-pgsql-db': path => '/bin:/usr/bin:/sbin:/usr/sbin', + environment => ['PGPASSWORD=icinga'], unless => 'psql -U icinga -d icinga -c "SELECT * FROM icinga_dbversion;" &> /dev/null', - command => 'sudo -u postgres psql -U icinga -d icinga < /usr/share/doc/icinga2-ido-pgsql-$(rpm -q icinga2-ido-pgsql | cut -d\'-\' -f4)/schema/pgsql.sql', + command => 'psql -U icinga -d icinga < /usr/share/doc/icinga2-ido-pgsql-$(rpm -q icinga2-ido-pgsql | cut -d\'-\' -f4)/schema/pgsql.sql', require => [ Package['icinga2-ido-pgsql'], Exec['create-pgsql-icinga2-ido-db'] ] } diff --git a/.vagrant-puppet/modules/pgsql/templates/pg_hba.conf.erb b/.vagrant-puppet/modules/pgsql/templates/pg_hba.conf.erb index f434b4802..a1273e7c8 100644 --- a/.vagrant-puppet/modules/pgsql/templates/pg_hba.conf.erb +++ b/.vagrant-puppet/modules/pgsql/templates/pg_hba.conf.erb @@ -67,14 +67,14 @@ # TYPE DATABASE USER CIDR-ADDRESS METHOD # icinga -local icinga icinga trust -host icinga icinga 127.0.0.1/32 trust -host icinga icinga ::1/128 trust +local icinga icinga md5 +host icinga icinga 127.0.0.1/32 md5 +host icinga icinga ::1/128 md5 # icinga -local icinga icinga trust -host icinga icinga 127.0.0.1/32 trust -host icinga icinga ::1/128 trust +local icinga icinga md5 +host icinga icinga 127.0.0.1/32 md5 +host icinga icinga ::1/128 md5 # "local" is for Unix domain socket connections only local all all ident