Merge pull request #1427 from tempesta-tech/ik-fix-systemd-start-issu…

…es-0.6 backport #1426 to 0.6
tempesta-tech · Jun 25, 2020 · 937b69c · 937b69c
2 parents 2877ee7 + 755cca0
commit 937b69c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/pkg/debian/changelog b/pkg/debian/changelog
@@ -1,3 +1,22 @@
+tempesta-fw-dkms (0.6.7) stretch; urgency=medium
+
+  * Fix issues when starting Tempesta via systemd (#1420).
+
+ -- Tempesta Technologies, Inc. <info@tempesta-tech.com>  Thu, 25 Jun 2020 20:11:18 +0500
+
+
+tempesta-fw-dkms (0.6.6) stretch; urgency=medium
+
+  * TempestaTLS 0.2 (tight TCP integration, fast handshake FSM)
+  * HTTPtables
+  * Sticky cookie extension for L7 DDoS mitigation
+  * Multiple HTTP limiting extensions
+  * SIMD memory functions
+  * Temporal client accounting
+  * Multiple bugfixes
+
+ -- Tempesta Technologies, Inc. <info@tempesta-tech.com>  Wed, 10 Jun 2020 11:10:28 +0500
+
 tempesta-fw-dkms (0.5.0) stretch; urgency=medium
 
   * Add HTTP health monitoring

diff --git a/pkg/debian/tempesta-fw.service b/pkg/debian/tempesta-fw.service
@@ -10,10 +10,12 @@ Environment="TDB_PATH=/lib/modules/%v/updates/dkms/"
 Environment="TLS_PATH=/lib/modules/%v/updates/dkms/"
 Environment="LIB_PATH=/lib/modules/%v/updates/dkms/"
 Environment=TFW_CFG_PATH=/etc/tempesta/tempesta_fw.conf
+Environment="TFW_SYSTEMD=1"
 RemainAfterExit=yes
 ExecStart=/lib/tempesta/scripts/tempesta.sh --start
-ExecStop=/lib/tempesta/scripts/tempesta.sh --stop
+ExecStopPost=/lib/tempesta/scripts/tempesta.sh --stop
 ExecReload=/lib/tempesta/scripts/tempesta.sh --reload
+TimeoutSec=infinity
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/tempesta.sh b/scripts/tempesta.sh
@@ -19,13 +19,15 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-if [ "${TEMPESTA_LCK}" != "$0" ]; then
-	env TEMPESTA_LCK="$0" flock -n -E 254 "/tmp/tempesta-lock-file" "$0" "$@"
-	if [ $? -eq 254 ]; then
-		echo "Cannot operate with Tempesta FW: locked by another process"
-		exit 3
+if [ -z "$TFW_SYSTEMD" ]; then
+	if [ "${TEMPESTA_LCK}" != "$0" ]; then
+		env TEMPESTA_LCK="$0" flock -n -E 254 "/tmp/tempesta-lock-file" "$0" "$@"
+		if [ $? -eq 254 ]; then
+			echo "Cannot operate with Tempesta FW: locked by another process"
+			exit 3
+		fi
+		exit
 	fi
-	exit
 fi
 
 . "$(dirname $0)/tfw_lib.sh"