From: Ansuel Smith <redacted>
Date: Sun, 2 Sep 2018 13:04:14 +0000 (+0200)
Subject: ariang: fix nginx support script logic
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=8245d6f071b70a41b1e86c00bfdbd41acb0f3979;p=openwrt-packages.git

ariang: fix nginx support script logic

Currently the uci-defaults script doesn't check if the rule is already present. This prevent any problem related by this.

Signed-off-by: Ansuel Smith <redacted>
---

diff --git a/net/ariang/files/80_ariang-nginx-support b/net/ariang/files/80_ariang-nginx-support
index bfe8862b2..a9762e09b 100644
--- a/net/ariang/files/80_ariang-nginx-support
+++ b/net/ariang/files/80_ariang-nginx-support
@@ -2,7 +2,8 @@
 
 
 if [ -f "/etc/nginx/nginx.conf" ] && [ -f "/etc/nginx/ariang.conf" ]; then
-	if [ ! "$(cat '/etc/nginx/nginx.conf' | grep -q 'server_name  localhost;')" ]; then
+	if [ "$( grep 'server_name  localhost;' < /etc/nginx/nginx.conf)" ] && 
+	[ ! "$( grep 'include ariang.conf;' < /etc/nginx/nginx.conf)" ]; then
 		sed -i '/server_name  localhost;/a \\t\tinclude ariang.conf;' /etc/nginx/nginx.conf
 		if [ -f /var/run/nginx.pid ]; then
 			/etc/init.d/nginx restart
@@ -11,3 +12,4 @@ if [ -f "/etc/nginx/nginx.conf" ] && [ -f "/etc/nginx/ariang.conf" ]; then
 fi
 
 exit 0
+