diff options
Diffstat (limited to 'modules/postgresql/manifests')
| -rw-r--r-- | modules/postgresql/manifests/database.pp | 2 | ||||
| -rw-r--r-- | modules/postgresql/manifests/remote_database.pp | 2 | ||||
| -rw-r--r-- | modules/postgresql/manifests/remote_db_and_user.pp | 2 | ||||
| -rw-r--r-- | modules/postgresql/manifests/var.pp | 8 |
4 files changed, 4 insertions, 10 deletions
diff --git a/modules/postgresql/manifests/database.pp b/modules/postgresql/manifests/database.pp index e984c145..34cee2a6 100644 --- a/modules/postgresql/manifests/database.pp +++ b/modules/postgresql/manifests/database.pp @@ -12,7 +12,7 @@ define postgresql::database($description = '', # this is fetched by the manifest asking the database creation, # once the db have been created # FIXME proper ordering ? - # FIXME In puppet >3.0 word 'tag' is reserved, so it have to berenamed + # FIXME In puppet >3.0 word 'tag' is reserved, so it has to be renamed @@postgresql::database_callback { $name: tag => $name, callback_notify => $callback_notify, diff --git a/modules/postgresql/manifests/remote_database.pp b/modules/postgresql/manifests/remote_database.pp index a9fb1a59..15b54651 100644 --- a/modules/postgresql/manifests/remote_database.pp +++ b/modules/postgresql/manifests/remote_database.pp @@ -1,4 +1,4 @@ -# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to berenamed +# FIXME: In puppet >3.0 word 'tag' is reserved, so it has to be renamed define postgresql::remote_database($description = '', $user = 'postgresql', $callback_notify = '', diff --git a/modules/postgresql/manifests/remote_db_and_user.pp b/modules/postgresql/manifests/remote_db_and_user.pp index eedeaa17..07e3ea23 100644 --- a/modules/postgresql/manifests/remote_db_and_user.pp +++ b/modules/postgresql/manifests/remote_db_and_user.pp @@ -11,7 +11,7 @@ define postgresql::remote_db_and_user($password, password => $password, } - # fetch the exported ressources that should have been exported + # fetch the exported resources that should have been exported # once the db was created, and trigger a notify to the object # passed as callback_notify Postgresql::Database_callback <<| tag == $name |>> diff --git a/modules/postgresql/manifests/var.pp b/modules/postgresql/manifests/var.pp index bda15cf6..b31c7ffe 100644 --- a/modules/postgresql/manifests/var.pp +++ b/modules/postgresql/manifests/var.pp @@ -1,13 +1,7 @@ class postgresql::var { $pgsql_data = '/var/lib/pgsql/data/' - - if versioncmp($::lsbdistrelease, '5') < 0 { - $pg_version = '9.0' - } else { - $pg_version = '9.6' - } - + $pg_version = '9.6' $hba_file = "${pgsql_data}/pg_hba.conf" } # vim: sw=2 |