From 223642e62b50247a78e62cacb30a71e156e89b62 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 14 Mar 2022 07:59:38 +0100
Subject: [PATCH] chore: ensure bash wraper in emqx.service, restart wait 60
 seconds

---
 CHANGES-4.3.md                   |  2 ++
 deploy/packages/emqx.service     | 13 ++++++++++---
 deploy/packages/rpm/emqx.service | 18 +-----------------
 3 files changed, 13 insertions(+), 20 deletions(-)
 mode change 100644 => 120000 deploy/packages/rpm/emqx.service

diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index 6f991e9c0..04447e220 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -26,6 +26,7 @@ File format:
 * `topic` parameter in bridge configuration can have `${node}` substitution (just like in `clientid` parameter)
 * Add UTF-8 string validity check in `strict_mode` for MQTT packet.
   When set to true, invalid UTF-8 strings will cause the client to be disconnected. i.e. client ID, topic name. [#7261]
+* Changed systemd service restart delay from 10 seconds to 60 seconds.
 
 ### Bug fixes
 
@@ -40,6 +41,7 @@ File format:
 * Fix rpc get node info maybe crash when other nodes is not ready.
 * Fix false alert level log “cannot_find_plugins” caused by duplicate plugin names in `loaded_plugins` files.
 * Prompt user how to change the dashboard's initial default password when emqx start.
+* Fix errno=13 'Permission denied' Cannot create FIFO boot error in Amazon Linux 2022 (el8 package)
 
 ## v4.3.12
 ### Important changes
diff --git a/deploy/packages/emqx.service b/deploy/packages/emqx.service
index ef9abfb01..def74a1a4 100644
--- a/deploy/packages/emqx.service
+++ b/deploy/packages/emqx.service
@@ -7,11 +7,18 @@ User=emqx
 Group=emqx
 Type=forking
 Environment=HOME=/var/lib/emqx
-ExecStart=/usr/bin/emqx start
+
+# Must use a 'bash' wrap for some OS
+# errno=13 'Permission denied'
+# Cannot create FIFO ... for writing
+ExecStart=bash /usr/bin/emqx start
+
 LimitNOFILE=1048576
-ExecStop=/usr/bin/emqx stop
+ExecStop=bash /usr/bin/emqx stop
 Restart=on-failure
-RestartSec=5s
+
+# When clustered, give the peers enough time to get this node's 'DOWN' event
+RestartSec=60s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/deploy/packages/rpm/emqx.service b/deploy/packages/rpm/emqx.service
deleted file mode 100644
index ef9abfb01..000000000
--- a/deploy/packages/rpm/emqx.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=emqx daemon
-After=network.target
-
-[Service]
-User=emqx
-Group=emqx
-Type=forking
-Environment=HOME=/var/lib/emqx
-ExecStart=/usr/bin/emqx start
-LimitNOFILE=1048576
-ExecStop=/usr/bin/emqx stop
-Restart=on-failure
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/deploy/packages/rpm/emqx.service b/deploy/packages/rpm/emqx.service
new file mode 120000
index 000000000..2fc64d79d
--- /dev/null
+++ b/deploy/packages/rpm/emqx.service
@@ -0,0 +1 @@
+../emqx.service
\ No newline at end of file