web-serving: fix startup of web-server as rootless

parsa-epfl · Nov 27, 2023 · 07ec9a2 · 07ec9a2
1 parent c9d7584
commit 07ec9a2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/benchmarks/web-serving/web_server/Dockerfile b/benchmarks/web-serving/web_server/Dockerfile
@@ -41,8 +41,9 @@ RUN mkdir /elgg_data
 RUN chmod a+rw /elgg_data
 
 # Copy over the Nginx Server configuration
-COPY files/nginx_sites_avail_pt.append /tmp/
-COPY files/nginx_sites_avail_tls.append /tmp/
+RUN rm /etc/nginx/sites-enabled/default
+COPY files/nginx_sites_avail_pt /etc/nginx/sites-available/
+COPY files/nginx_sites_avail_tls /etc/nginx/sites-available/
 
 
 RUN service nginx restart

diff --git a/benchmarks/web-serving/web_server/bootstrap.sh b/benchmarks/web-serving/web_server/bootstrap.sh
@@ -17,9 +17,9 @@ sed -i -e"s/mysql_server/${DB_SERVER_IP}/" elgg/elgg-config/settings.php
 sed -i -e"s/'memcache_server'/'${MEMCACHE_SERVER_IP}'/" elgg/elgg-config/settings.php
 
 if [ $PROTOCOL == 'https' ]; then
-    cat /tmp/nginx_sites_avail_tls.append >> /etc/nginx/sites-available/default
+    ln -sf ../sites-available/nginx_sites_avail_tls /etc/nginx/sites-enabled/cloudsuite
 elif [ $PROTOCOL == 'http' ]; then
-    cat /tmp/nginx_sites_avail_pt.append >> /etc/nginx/sites-available/default
+    ln -sf ../sites-available/nginx_sites_avail_pt /etc/nginx/sites-enabled/cloudsuite
 fi
 
 FPM_CHILDREN=${5:-4}

diff --git a/..._server/files/nginx_sites_avail_pt.append → ...ing/web_server/files/nginx_sites_avail_pt b/..._server/files/nginx_sites_avail_pt.append → ...ing/web_server/files/nginx_sites_avail_pt
diff --git a/...server/files/nginx_sites_avail_tls.append → ...ng/web_server/files/nginx_sites_avail_tls b/...server/files/nginx_sites_avail_tls.append → ...ng/web_server/files/nginx_sites_avail_tls