From acdf4d9e4eac36f761481268be549ee0a483b8b9 Mon Sep 17 00:00:00 2001
From: raphaesl <raphaesl@stud.ntnu.no>
Date: Tue, 31 Jan 2023 13:54:23 +0100
Subject: [PATCH] masse greier
---
.../database => database}/checkDbStatus.sh | 0
scripts/dockerInstall.sh => dockerInstall.sh | 0
eksempelHtml.html => oblig1/eksempelHtml.html | 0
webserver/Dockerfile | 32 +++++++++++++++++++
webserver/config.php | 10 ++++++
5 files changed, 42 insertions(+)
rename {scripts/database => database}/checkDbStatus.sh (100%)
rename scripts/dockerInstall.sh => dockerInstall.sh (100%)
rename eksempelHtml.html => oblig1/eksempelHtml.html (100%)
diff --git a/scripts/database/checkDbStatus.sh b/database/checkDbStatus.sh
similarity index 100%
rename from scripts/database/checkDbStatus.sh
rename to database/checkDbStatus.sh
diff --git a/scripts/dockerInstall.sh b/dockerInstall.sh
similarity index 100%
rename from scripts/dockerInstall.sh
rename to dockerInstall.sh
diff --git a/eksempelHtml.html b/oblig1/eksempelHtml.html
similarity index 100%
rename from eksempelHtml.html
rename to oblig1/eksempelHtml.html
diff --git a/webserver/Dockerfile b/webserver/Dockerfile
index e69de29..18ced13 100644
--- a/webserver/Dockerfile
+++ b/webserver/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:22.04
+MAINTAINER raphaesl@stud.ntnu.no
+MAINTAINER saraslu@stud.ntnu.no
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install Apache
+RUN apt-get update && apt-get install -y apache2 libapache2-mod-php php-pgsql net-tools
+
+# Download needed repositories
+RUN mkdir temp
+RUN git clone https://github.com/hioa-cs/bookface.git
+RUN git clone https://gitlab.stud.idi.ntnu.no/raphaesl/dcsg2003
+
+# Configure files for apache
+RUN rm /var/www/html/index.html
+RUN mkdir /var/www/html/images
+
+# Move bookface repo to apache
+ADD temp/bookface/code/* /var/www/html/
+ADD temp/bookface/init.sh /
+
+# Move group repo to apache
+ADD temp/dcsg2003/webserver/config.php /var/www/html
+
+# Delete trash
+RUN rm -r temp
+
+# Misc
+EXPOSE 80
+ENTRYPOINT ["/usr/sbin/apache2ctl","-D","FOREGROUND","-k","start"]
+
diff --git a/webserver/config.php b/webserver/config.php
index e69de29..997fcfb 100644
--- a/webserver/config.php
+++ b/webserver/config.php
@@ -0,0 +1,10 @@
+<?php
+$dbhost = "192.168.130.246";
+$dbport = "26257";
+$db = "bf";
+$dbuser = "AETAadmin";
+$dbpassw = '';
+$webhost = '10.212.169.121';
+$weburl = 'http://' . $webhost ;
+$frontpage_limit = "500";
+?>
\ No newline at end of file
--
GitLab