From 5ccd98db58b4b87f426b3bb68075b9e66386190f Mon Sep 17 00:00:00 2001 From: zeus Date: Mon, 29 Nov 2021 22:09:07 +0200 Subject: [PATCH] new build --- install/usr/share/swarmlab.io/sec/project/bin/start-nginx.sh | 3 +-- install/usr/share/swarmlab.io/sec/project/data-www/index.html | 4 ++-- install/usr/share/swarmlab.io/sec/swarmlab-sec | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/install/usr/share/swarmlab.io/sec/project/bin/start-nginx.sh b/install/usr/share/swarmlab.io/sec/project/bin/start-nginx.sh index b6daffc..fd591f6 100755 --- a/install/usr/share/swarmlab.io/sec/project/bin/start-nginx.sh +++ b/install/usr/share/swarmlab.io/sec/project/bin/start-nginx.sh @@ -1,3 +1,2 @@ #!/bin/sh -#/usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf & +/usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf diff --git a/install/usr/share/swarmlab.io/sec/project/data-www/index.html b/install/usr/share/swarmlab.io/sec/project/data-www/index.html index d801c87..2399c7f 100644 --- a/install/usr/share/swarmlab.io/sec/project/data-www/index.html +++ b/install/usr/share/swarmlab.io/sec/project/data-www/index.html @@ -74,7 +74,7 @@ -

Welcome to nginx on Fedora!

+

Welcome to nginx on Swarmlab.io!

This page is used to test the proper operation of the @@ -88,7 +88,7 @@

This is the default index.html page that is distributed with nginx on - Fedora. It is located in + Swarmlab.io. It is located in /data/www.

You should now put your content in a location of diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index 9eccbe2..4e44561 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -297,7 +297,6 @@ services: - $Wdir/project/config/nginx.conf:/etc/nginx/nginx.conf - $Wdir/project/config/default.conf:/etc/nginx/conf.d/default.conf - $Wdir/project/config/supervisord.conf:/etc/supervisor/supervisord.conf - - $Wdir/project/bin/start-nginx.sh:/root/start-nginx.sh # workerservice: