diff options
| author | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-02-02 19:13:30 +0100 |
|---|---|---|
| committer | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-02-02 20:19:27 +0100 |
| commit | 6dc2ca2219101a2f6d67b9b1ac00a97c303b2275 (patch) | |
| tree | 63a1f260ffaba5ccdde90ef2c571a25e09031053 /net/ariang/files | |
| parent | 696f5565f8a94cddda6f19860787e675e6010f7d (diff) | |
ariang: rename nginx configuration file
This makes the ariang-nginx ready for Nginx using the conf.d directory.
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Diffstat (limited to 'net/ariang/files')
| -rw-r--r-- | net/ariang/files/80_ariang-nginx-support | 8 | ||||
| -rw-r--r-- | net/ariang/files/ariang.locations (renamed from net/ariang/files/ariang.conf) | 0 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/ariang/files/80_ariang-nginx-support b/net/ariang/files/80_ariang-nginx-support index a9762e09b..f3eea690f 100644 --- a/net/ariang/files/80_ariang-nginx-support +++ b/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 - sed -i '/server_name localhost;/a \\t\tinclude ariang.conf;' /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 diff --git a/net/ariang/files/ariang.conf b/net/ariang/files/ariang.locations index 28b0a8ada..28b0a8ada 100644 --- a/net/ariang/files/ariang.conf +++ b/net/ariang/files/ariang.locations |