Skip to content

Commit 236ce47

Browse files
committed
Added info about the advanced configuration file
1 parent db93a91 commit 236ce47

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ postgresql
1212
8. [Disclaimer - Licensing information](#disclaimer)
1313
9. [Transfer Notice - Notice of authorship change](#transfer-notice)
1414
10. [Contributors - List of module contributors](#contributors)
15-
8. [Release Notes - Notes on the most recent updates to the module](#release-notes)
15+
11. [Release Notes - Notes on the most recent updates to the module](#release-notes)
1616

1717

1818
Overview
@@ -72,6 +72,9 @@ Once you've completed your configuration of `postgresql::server`, you can test o
7272

7373
If you get an error message from these commands, it means that your permissions are set in a way that restricts access from where you’re trying to connect. That might be a good thing or a bad thing, depending on your goals.
7474

75+
Advanced configuration setting parameters can be placed into `postgresql_puppet_extras.conf` (located in the same folder as `postgresql.conf`). You can manage that file as a normal puppet file resource, or however you see fit; which gives you complete control over the settings. Any value you specify in that file will override any existing value set in the templated version.
76+
For more details about server configuration parameters see http://www.postgresql.org/docs/9.2/static/runtime-config.html.
77+
7578
###Configuring the database
7679

7780
There are many ways to set up a postgres database using the `postgresql::db` class. For instance, to set up a database for PuppetDB (this assumes you’ve already got the `postgresql::server` set up to your liking in your manifest, as discussed above):
@@ -199,6 +202,10 @@ This class is used to manage the basic postgresql client packages (which include
199202

200203
This defined type can be used to create a database with no users and no permissions, which is a rare use case.
201204

205+
**postgresql::tablespace**
206+
207+
This defined type can be used to create a tablespace.
208+
202209
**postgresql_psql**
203210

204211
This defined type manages the command line tool for the postgresql module.

manifests/server.pp

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
# [*package_name*] - name of package
99
# [*service_name*] - name of service
1010
#
11+
# Configuration:
12+
# Advanced configuration setting parameters can be placed into 'postgresql_puppet_extras.conf' (located in the same
13+
# folder as 'postgresql.conf'). You can manage that file as a normal puppet file resource, or however you see fit;
14+
# which gives you complete control over the settings. Any value you specify in that file will override any existing
15+
# value set in the templated version.
16+
#
1117
# Actions:
1218
#
1319
# Requires:
@@ -61,5 +67,4 @@
6167
onlyif => $service_status,
6268
refreshonly => true,
6369
}
64-
6570
}

spec/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ instead do something like:
2727

2828
For some options that might speed up the testing process a bit during development,
2929
please see `spec/support/postgres_test_config.rb`.
30+
31+
By default the sahara gem restores VMs to a snapshot state after each test,
32+
to make sure that the individual tests aren't polluting the ones that are run later.
33+
If you want to disable this during development, you can set HardCoreTesting to false
34+
in `spec/support/postgres_test_config.rb`.

0 commit comments

Comments
 (0)