Browse Source

Make config file location configurable

tags/1.1
Timo Röhling 11 years ago
parent
commit
e33d892526
5 changed files with 10 additions and 8 deletions
  1. 1
    0
      CMakeLists.txt
  2. 3
    2
      postinstall.cmake.in
  3. 2
    2
      postsrsd.lsb_init.in
  4. 3
    3
      postsrsd.rh_init.in
  5. 1
    1
      postsrsd.upstart.in

+ 1
- 0
CMakeLists.txt View File

5
 option(USE_APPARMOR "Enable AppArmor profile" OFF)
5
 option(USE_APPARMOR "Enable AppArmor profile" OFF)
6
 
6
 
7
 set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")
7
 set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")
8
+set(CONFIG_DIR "/etc/default" CACHE PATH "Location of configuration file")
8
 
9
 
9
 find_program(HELP2MAN help2man DOC "path to help2man executable")
10
 find_program(HELP2MAN help2man DOC "path to help2man executable")
10
 find_program(DD dd DOC "path to dd executable")
11
 find_program(DD dd DOC "path to dd executable")

+ 3
- 2
postinstall.cmake.in View File

1
 set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")
1
 set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")
2
 set(CHROOT_DIR "@CHROOT_DIR@")
2
 set(CHROOT_DIR "@CHROOT_DIR@")
3
+set(CONFIG_DIR "@CONFIG_DIR@")
3
 set(INIT_FLAVOR "@INIT_FLAVOR@")
4
 set(INIT_FLAVOR "@INIT_FLAVOR@")
4
 set(SECRET_FILE "@PROJECT_NAME@.secret")
5
 set(SECRET_FILE "@PROJECT_NAME@.secret")
5
 set(DD "@DD@")
6
 set(DD "@DD@")
12
 	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")
13
 	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")
13
 endif()
14
 endif()
14
 
15
 
15
-if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}/etc/default/@PROJECT_NAME@")
16
-	file(INSTALL FILES "@CMAKE_CURRENT_SOURCE_DIR@/@PROJECT_NAME@.default" DESTINATION "/etc/default" RENAME "@PROJECT_NAME@")
16
+if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
17
+	file(INSTALL FILES "@CMAKE_CURRENT_SOURCE_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@")
17
 endif()
18
 endif()
18
 
19
 
19
 if(INIT_FLAVOR STREQUAL "sysv-lsb")
20
 if(INIT_FLAVOR STREQUAL "sysv-lsb")

+ 2
- 2
postsrsd.lsb_init.in View File

36
 CHROOT=@CHROOT_DIR@
36
 CHROOT=@CHROOT_DIR@
37
 
37
 
38
 # Read config file if it is present.
38
 # Read config file if it is present.
39
-if [ -r /etc/default/$NAME ]
39
+if [ -r @CONFIG_DIR@/$NAME ]
40
 then
40
 then
41
-    . /etc/default/$NAME
41
+    . @CONFIG_DIR@/$NAME
42
 fi
42
 fi
43
 
43
 
44
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0
44
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0

+ 3
- 3
postsrsd.rh_init.in View File

7
 # description: Sender Rewriting Scheme (SRS) for Postfix.
7
 # description: Sender Rewriting Scheme (SRS) for Postfix.
8
 # processname: @POSTSRSD@
8
 # processname: @POSTSRSD@
9
 # pidfile: /var/run/@PROJECT_NAME@.pid
9
 # pidfile: /var/run/@PROJECT_NAME@.pid
10
-# config: /etc/default/@PROJECT_NAME@
10
+# config: @CONFIG_DIR@/@PROJECT_NAME@
11
 
11
 
12
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
12
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
13
 DAEMON=@CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@
13
 DAEMON=@CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@
32
 CHROOT=@CHROOT_DIR@
32
 CHROOT=@CHROOT_DIR@
33
 
33
 
34
 # Read config file if it is present.
34
 # Read config file if it is present.
35
-if [ -r /etc/default/$NAME ]
35
+if [ -r @CONFIG_DIR@/$NAME ]
36
 then
36
 then
37
-    . /etc/default/$NAME
37
+    . @CONFIG_DIR@/$NAME
38
 fi
38
 fi
39
 
39
 
40
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0
40
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0

+ 1
- 1
postsrsd.upstart.in View File

5
 stop on runlevel [!2345]
5
 stop on runlevel [!2345]
6
 respawn
6
 respawn
7
 
7
 
8
-env DEFAULTFILE=/etc/default/@PROJECT_NAME@
8
+env DEFAULTFILE=@CONFIG_DIR@/@PROJECT_NAME@
9
 
9
 
10
 script
10
 script
11
 	SRS_DOMAIN=`postconf -h mydomain || true`
11
 	SRS_DOMAIN=`postconf -h mydomain || true`

Loading…
Cancel
Save