Move init-related stuff to its own folder

CMakeLists.txt

@@ -61,12 +61,12 @@ set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")
 string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}")
 string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")
 
-configure_file(${PROJECT_NAME}.lsb_init.in ${PROJECT_NAME}.lsb_init @ONLY)
-configure_file(${PROJECT_NAME}.rh_init.in ${PROJECT_NAME}.rh_init @ONLY)
-configure_file(${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
-configure_file(${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
-configure_file(${PROJECT_NAME}.service.in ${PROJECT_NAME}.service @ONLY)
-configure_file(${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY)
+configure_file(init/${PROJECT_NAME}.sysv-lsb.in ${PROJECT_NAME}.sysv-lsb @ONLY)
+configure_file(init/${PROJECT_NAME}.sysv-redhat.in ${PROJECT_NAME}.sysv-redhat @ONLY)
+configure_file(init/${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
+configure_file(init/${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
+configure_file(init/${PROJECT_NAME}.systemd.in ${PROJECT_NAME}.systemd @ONLY)
+configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY)
 
 configure_file(postinstall.cmake.in postinstall.cmake @ONLY)
 

postsrsd.default.in → init/postsrsd.default.in

@@ -1,7 +1,7 @@
 # Default settings for postsrsd
 
-# Local domain name. 
-# Addresses are rewritten to originate from this domain. The default value 
+# Local domain name.
+# Addresses are rewritten to originate from this domain. The default value
 # is taken from `postconf -h mydomain` and probably okay.
 #
 #SRS_DOMAIN=example.com
@@ -17,7 +17,7 @@
 # When postsrsd is installed for the first time, a random secret is generated
 # and stored in /etc/postsrsd.secret. For most installations, that's just fine.
 #
-SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
+#SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
 
 # Local ports for TCP list.
 # 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
 #SRS_FORWARD_PORT=10001
 #SRS_REVERSE_PORT=10002
 
-# Drop root privileges and run as another user after initialization. 
+# Drop root privileges and run as another user after initialization.
 # This is highly recommended as postsrsd handles untrusted input.
 #
-RUN_AS=nobody
+#RUN_AS=nobody
 

postinstall.cmake.in

@@ -19,14 +19,14 @@ if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
 endif()
 
 if(INIT_FLAVOR STREQUAL "sysv-lsb")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.lsb_init" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-lsb" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
 	if(INSSERV)
 		execute_process(
 			COMMAND ${INSSERV} -p "$ENV{DESTDIR}${SYSCONF_DIR}/init.d" @PROJECT_NAME@
 		)
 	endif()
 elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.rh_init" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-redhat" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
 	if(CHKCONFIG AND NOT "$ENV{DESTDIR}")
 		execute_process(
 			COMMAND ${CHKCONFIG} --add @PROJECT_NAME@
@@ -35,7 +35,7 @@ elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
 elseif(INIT_FLAVOR STREQUAL "upstart")
 	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "${SYSCONF_DIR}/init" RENAME "@PROJECT_NAME@.conf")
 elseif(INIT_FLAVOR STREQUAL "systemd")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.service" DESTINATION "${SYSCONF_DIR}/systemd/system" RENAME "@PROJECT_NAME@.service")
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.systemd" DESTINATION "${SYSCONF_DIR}/systemd/system" RENAME "@PROJECT_NAME@.service")
 endif()
 
 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
 file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${SYSCONF_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
 file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")
 endif()
+