diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-02-27 15:57:08 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-02-27 16:08:11 +0100 |
| commit | 9094981751e776fa93537c91bc0e678f4d806b91 (patch) | |
| tree | f8fae32b51dbd08ef2343da8084d6dbab9d0f6f3 /postgresql-check-db-dir.in | |
| parent | 28c5dbbab21fb19606cb548582885458928eda30 (diff) | |
| download | postgresql-setup-9094981751e776fa93537c91bc0e678f4d806b91.tar.gz postgresql-setup-9094981751e776fa93537c91bc0e678f4d806b91.tar.xz postgresql-setup-9094981751e776fa93537c91bc0e678f4d806b91.zip | |
configury: another scl-izing commit
* Makefile.am: Move systemd directory definitions into
configure.ac. This is then easily configurable via config.site.
* configure.ac (PGENGINE, PG_CTL_BIN): Remove, bindir is
sufficient.
(PREVMAJORVERSION, PREVPGENGINE): Removed. It si configurable
now.
(INIDB_SCLS): Generalize into SCLS variable.
(SCLS): Moved from INIDB_SCLS.
(PGDATADIR): Default changed to have ${prefix} inside.
(SED_RULES): Remove unused variables (or to not be
used, TODO for next commit).
(conf_dir): New macro to define config.site
friendly directory variable.
(SCL_SHELL_WRAPPER): Convenient macro to generate appropriate call
to scl binary (only when building for software collections).
* postgresql-check-db-dir.in: Use new variable layout.
* postgresql-ctl.in: Likewise.
* postgresql-setup.in: Likewise.
* postgresql.service.in: Likewise. This fixes regression of not
using ${bindir} properly.
Diffstat (limited to 'postgresql-check-db-dir.in')
| -rw-r--r-- | postgresql-check-db-dir.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postgresql-check-db-dir.in b/postgresql-check-db-dir.in index f8adc2d..fec7891 100644 --- a/postgresql-check-db-dir.in +++ b/postgresql-check-db-dir.in @@ -17,7 +17,7 @@ service_name="$1" if [ -z "$PGDATA" ]; then echo $"You try to start '$service_name' service" echo $"but the required \$PGDATA environment variable is not set." - echo $"You should use the @userunitsdir@/$service_name.service.d/ANYTHING.conf" + echo $"You should use the @systemduserunitsdir@/$service_name.service.d/ANYTHING.conf" echo $"configuration file to set \$PGDATA. For more info see" echo $"the @README_DIST@ file." @@ -27,7 +27,7 @@ fi # Warn the user that the configuration should be adjusted via drop-in, in case # the $PGDATA variable is set different way (and non-default service name is # used). -conf_dir="@userunitsdir@/$service_name.service.d" +conf_dir="@systemduserunitsdir@/$service_name.service.d" if [[ "$service_name" == *@* ]] && test ! -d "$conf_dir"; then echo >&2 $"WARNING: Note that the '$conf_dir'" echo >&2 $"directory does not exist while you are using non-default service" |