Merge pull request #506 from pghmcfc/systemd-simple

Switch to Type = simple and add configuration test

contrib/dist/rpm/proftpd.service

@@ -3,14 +3,13 @@ Description = ProFTPD FTP Server
 After = network.target nss-lookup.target local-fs.target remote-fs.target
 
 [Service]
-Type = forking
-PIDFile = /run/proftpd/proftpd.pid
+Type = simple
 Environment = PROFTPD_OPTIONS=
 EnvironmentFile = -/etc/sysconfig/proftpd
-ExecStart = /usr/sbin/proftpd $PROFTPD_OPTIONS
-ExecStartPost = /usr/bin/touch /var/lock/subsys/proftpd
-ExecStopPost = /bin/rm -f /var/lock/subsys/proftpd
+ExecStartPre = /usr/sbin/proftpd --configtest
+ExecStart = /usr/sbin/proftpd --nodaemon $PROFTPD_OPTIONS
 ExecReload = /bin/kill -HUP $MAINPID
+PIDFile = /run/proftpd/proftpd.pid
 
 [Install]
 WantedBy = multi-user.target