소스 검색

Move init-related stuff to its own folder

tags/1.2
Timo Röhling 10 년 전
부모
커밋
6aa118f5a7
8개의 변경된 파일15개의 추가작업 그리고 14개의 파일을 삭제
  1. 6
    6
      CMakeLists.txt
  2. 0
    0
      init/postsrsd.apparmor.in
  3. 5
    5
      init/postsrsd.default.in
  4. 0
    0
      init/postsrsd.systemd.in
  5. 0
    0
      init/postsrsd.sysv-lsb.in
  6. 0
    0
      init/postsrsd.sysv-redhat.in
  7. 0
    0
      init/postsrsd.upstart.in
  8. 4
    3
      postinstall.cmake.in

+ 6
- 6
CMakeLists.txt 파일 보기

@@ -61,12 +61,12 @@ set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")
61 61
 string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}")
62 62
 string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")
63 63
 
64
-configure_file(${PROJECT_NAME}.lsb_init.in ${PROJECT_NAME}.lsb_init @ONLY)
65
-configure_file(${PROJECT_NAME}.rh_init.in ${PROJECT_NAME}.rh_init @ONLY)
66
-configure_file(${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
67
-configure_file(${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
68
-configure_file(${PROJECT_NAME}.service.in ${PROJECT_NAME}.service @ONLY)
69
-configure_file(${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY)
64
+configure_file(init/${PROJECT_NAME}.sysv-lsb.in ${PROJECT_NAME}.sysv-lsb @ONLY)
65
+configure_file(init/${PROJECT_NAME}.sysv-redhat.in ${PROJECT_NAME}.sysv-redhat @ONLY)
66
+configure_file(init/${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
67
+configure_file(init/${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
68
+configure_file(init/${PROJECT_NAME}.systemd.in ${PROJECT_NAME}.systemd @ONLY)
69
+configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY)
70 70
 
71 71
 configure_file(postinstall.cmake.in postinstall.cmake @ONLY)
72 72
 

postsrsd.apparmor.in → init/postsrsd.apparmor.in 파일 보기


postsrsd.default.in → init/postsrsd.default.in 파일 보기

@@ -1,7 +1,7 @@
1 1
 # Default settings for postsrsd
2 2
 
3
-# Local domain name. 
4
-# Addresses are rewritten to originate from this domain. The default value 
3
+# Local domain name.
4
+# Addresses are rewritten to originate from this domain. The default value
5 5
 # is taken from `postconf -h mydomain` and probably okay.
6 6
 #
7 7
 #SRS_DOMAIN=example.com
@@ -17,7 +17,7 @@
17 17
 # When postsrsd is installed for the first time, a random secret is generated
18 18
 # and stored in /etc/postsrsd.secret. For most installations, that's just fine.
19 19
 #
20
-SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
20
+#SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
21 21
 
22 22
 # Local ports for TCP list.
23 23
 # These ports are used to bind the TCP list for postfix. If you change
@@ -28,8 +28,8 @@ SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
28 28
 #SRS_FORWARD_PORT=10001
29 29
 #SRS_REVERSE_PORT=10002
30 30
 
31
-# Drop root privileges and run as another user after initialization. 
31
+# Drop root privileges and run as another user after initialization.
32 32
 # This is highly recommended as postsrsd handles untrusted input.
33 33
 #
34
-RUN_AS=nobody
34
+#RUN_AS=nobody
35 35
 

postsrsd.service.in → init/postsrsd.systemd.in 파일 보기


postsrsd.lsb_init.in → init/postsrsd.sysv-lsb.in 파일 보기


postsrsd.rh_init.in → init/postsrsd.sysv-redhat.in 파일 보기


postsrsd.upstart.in → init/postsrsd.upstart.in 파일 보기


+ 4
- 3
postinstall.cmake.in 파일 보기

@@ -19,14 +19,14 @@ if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
19 19
 endif()
20 20
 
21 21
 if(INIT_FLAVOR STREQUAL "sysv-lsb")
22
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.lsb_init" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
22
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-lsb" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
23 23
 	if(INSSERV)
24 24
 		execute_process(
25 25
 			COMMAND ${INSSERV} -p "$ENV{DESTDIR}${SYSCONF_DIR}/init.d" @PROJECT_NAME@
26 26
 		)
27 27
 	endif()
28 28
 elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
29
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.rh_init" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
29
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-redhat" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
30 30
 	if(CHKCONFIG AND NOT "$ENV{DESTDIR}")
31 31
 		execute_process(
32 32
 			COMMAND ${CHKCONFIG} --add @PROJECT_NAME@
@@ -35,7 +35,7 @@ elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
35 35
 elseif(INIT_FLAVOR STREQUAL "upstart")
36 36
 	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "${SYSCONF_DIR}/init" RENAME "@PROJECT_NAME@.conf")
37 37
 elseif(INIT_FLAVOR STREQUAL "systemd")
38
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.service" DESTINATION "${SYSCONF_DIR}/systemd/system" RENAME "@PROJECT_NAME@.service")
38
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.systemd" DESTINATION "${SYSCONF_DIR}/systemd/system" RENAME "@PROJECT_NAME@.service")
39 39
 endif()
40 40
 
41 41
 if(GENERATE_SRS_SECRET AND DD AND BASE64 AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}${SYSCONF_DIR}/${SECRET_FILE}")
@@ -50,3 +50,4 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64 AND EXISTS "/dev/urandom" AND NOT EXIST
50 50
 file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${SYSCONF_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
51 51
 file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")
52 52
 endif()
53
+

Loading…
취소
저장