Merge pull request #11217 from peter-stadler/ariang-nginx

ariang: rename nginx configuration file

net/ariang/Makefile

@@ -61,8 +61,8 @@ endef
 
 define Package/ariang-nginx/install
 	$(Package/ariang/install)
-	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_DIR) $(1)/etc/nginx/conf.d/
-	$(INSTALL_BIN) ./files/ariang.conf $(1)/etc/nginx/ariang.conf
+	$(INSTALL_BIN) ./files/ariang.locations $(1)/etc/nginx/conf.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/80_ariang-nginx-support $(1)/etc/uci-defaults/80_ariang-nginx-support
 endef

net/ariang/files/80_ariang-nginx-support

@@ -1,10 +1,12 @@
 #!/bin/sh
 
 
-if [ -f "/etc/nginx/nginx.conf" ] && [ -f "/etc/nginx/ariang.conf" ]; then
+if [ -f "/etc/nginx/nginx.conf" ] && [ -f "/etc/nginx/conf.d/ariang.locations" ];
+then
 	if [ "$( grep 'server_name  localhost;' < /etc/nginx/nginx.conf)" ] && 
-	[ ! "$( grep 'include ariang.conf;' < /etc/nginx/nginx.conf)" ]; then
+	[ ! "$( grep 'include conf.d/ariang.locations;' < /etc/nginx/nginx.conf)" ]; then
-		sed -i '/server_name  localhost;/a \\t\tinclude ariang.conf;' /etc/nginx/nginx.conf
+		sed -i '/server_name  localhost;/\
+			a\\tinclude conf.d/ariang.locations;' /etc/nginx/nginx.conf
 		if [ -f /var/run/nginx.pid ]; then
 			/etc/init.d/nginx restart
 		fi