Packages: log and pid paths made consistent.

pkg/deb/debian/unit.default

@@ -1 +1 @@
-DAEMON_ARGS="--log /var/log/unit.log --pid /run/unit.pid"
+DAEMON_ARGS="--log /var/log/unit.log --pid /var/run/unit.pid"

pkg/deb/debian/unit.init

@@ -31,7 +31,7 @@ umask 022
 case "$1" in
     start)
        	log_daemon_msg "Starting $DESC" "$NAME"
-        if start-stop-daemon --start --quiet --pidfile /run/$NAME.pid \
+        if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
                 --exec $DAEMON -- $DAEMON_ARGS; then
                 log_end_msg 0
         else

pkg/deb/debian/unit.service

@@ -5,7 +5,7 @@ After=network-online.target
 
 [Service]
 Type=forking
-PIDFile=/run/unit.pid
+PIDFile=/var/run/unit.pid
 EnvironmentFile=-/etc/default/unit
 ExecStart=/usr/sbin/unitd $DAEMON_ARGS
 ExecReload=

pkg/rpm/Makefile

@@ -140,8 +140,8 @@ CONFIGURE_ARGS=\
 	--prefix=/usr \
 	--state=%{_sharedstatedir}/unit \
 	--control="unix:/var/run/unit/control.sock" \
-	--pid=/var/run/unit.pid \
+	--pid=/var/run/unit/unit.pid \
-	--log=/var/log/unit.log \
+	--log=/var/log/unit/unit.log \
 	--tests \
 	--openssl
 

pkg/rpm/rpmbuild/SOURCES/unit.service

@@ -7,7 +7,7 @@
 # the following:
 
 #       [Service]
-#       Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid"
+#       Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
 
 [Unit]
 Description=NGINX Unit
@@ -16,7 +16,7 @@ After=network-online.target
 
 [Service]
 Type=simple
-Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid"
+Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
 ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon
 ExecReload=
 RuntimeDirectory=unit