- one more fix in postgresql.init: initialize defaults before reading service

  config, so init script won't fail if config file is present but some variable
  is not set
- release 7

Changed files:
    postgresql.init -> 1.36
    postgresql.spec -> 1.163

diff --git a/postgresql.init b/postgresql.init
index 4b64d679e3e8136e9573f13d9363e55e24a8ee82..af4cdf3f715cd61050f2e194035ba41ac31b460c 100644 (file)
--- a/postgresql.init
+++ b/postgresql.init
@@ -17,15 +17,16 @@
 # Get network config
 . /etc/sysconfig/network
 
+# Service config defaults
+ALLOW_TCP_CONNECTIONS=no
+ALLOW_USE_SSL=no
+POSTGRES_DATA_DIR=/var/lib/pgsql
+POSTGRES_LOG=/var/log/pgsql
+ENCODING=UNICODE
+
 # Get service config
 if [ -f /etc/sysconfig/postgresql ] ; then
         . /etc/sysconfig/postgresql
-else
-        ALLOW_TCP_CONNECTIONS=no
-       ALLOW_USE_SSL=no
-       POSTGRES_DATA_DIR=/var/lib/pgsql
-       POSTGRES_LOG=/var/log/pgsql
-       ENCODING=UNICODE
 fi
 
 # Check that networking is up.

diff --git a/postgresql.spec b/postgresql.spec
index fac2c27a52a87920b83bf1f707eb955e5d193341..90942e791c9c8ad0bfcc5d05b8f4d8693ecd6f6b 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -17,7 +17,7 @@ Summary(tr):  Veri Taban
 Summary(uk):   PostgreSQL - ÓÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÂÁÚÁÍÉ ÄÁÎÉÈ
 Name:          postgresql
 Version:       7.2.1
-Release:       6
+Release:       7
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.gz