use --control option instead of build options

nginx · Jan 15, 2019 · 2dc791b · 2dc791b
1 parent 9eedfb9
commit 2dc791b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
@@ -98,7 +98,7 @@ endif
 CONFIGURE_ARGS=\
 	--prefix=/usr \
 	--state=%{_sharedstatedir}/unit \
-	--control="unix:/var/run/unit/control.sock" \
+	--control="unix:/var/run/control.unit.sock" \
 	--pid=/var/run/unit.pid \
 	--log=/var/log/unit.log \
 	--tests \

diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/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=--control unix:/run/unit/control.sock --log /var/log/unit/unit.log --pid /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=--control unix:/run/unit/control.sock --log /var/log/unit/unit.log --pid /run/unit/unit.pid"
 ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon
 ExecReload=
 RuntimeDirectory=unit

diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf
@@ -1 +1 @@
-UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
+UNITD_OPTIONS="--control unix:/var/run/unit/control.sock --log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"