From 5241d606149392c9cd835f0e909cbbcca2395a0f Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Tue, 4 Feb 2020 13:14:15 +0100 Subject: [PATCH] ariang: use new configuration of Nginx Remove the superfluous parts of the uci-defaults file. Signed-off-by: Peter Stadler --- net/ariang/Makefile | 2 +- net/ariang/files/80_ariang-nginx-support | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/net/ariang/Makefile b/net/ariang/Makefile index 48ff438cc..7f6d27908 100644 --- a/net/ariang/Makefile +++ b/net/ariang/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ariang PKG_VERSION:=1.1.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://codeload.github.com/mayswind/AriaNg-DailyBuild/tar.gz/$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/net/ariang/files/80_ariang-nginx-support b/net/ariang/files/80_ariang-nginx-support index f3eea690f..0a89ccd1b 100644 --- a/net/ariang/files/80_ariang-nginx-support +++ b/net/ariang/files/80_ariang-nginx-support @@ -1,17 +1,5 @@ #!/bin/sh - -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 conf.d/ariang.locations;' < /etc/nginx/nginx.conf)" ]; then - 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 - fi -fi +[ -x /etc/init.d/nginx ] && /etc/init.d/nginx running && /etc/init.d/nginx reload exit 0 -