Lingonpaj

commit 701f0b7fdd55dc8b6ceb474e79be555b41267845 Author: Joakim Olsson Date: Fri Sep 21 21:15:19 2018 +0200 Initial commit diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b8ead76 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM nginx +MAINTAINER Joakim Olsson + +ADD files/*.html files/*.jpg files/*.mp3 /usr/share/nginx/html/ + +ADD files/sprangning/* /usr/share/nginx/html/sprangning/ + +ADD default.conf /etc/nginx/conf.d/default.conf + +ENV ALLOW_HUP true +ENV ROTATE_LOGS true diff --git a/default.conf b/default.conf new file mode 100644 index 0000000..42f5490 --- /dev/null +++ b/default.conf @@ -0,0 +1,17 @@ +server { + listen 80; + server_name localhost; + + access_log /log/access.log combined; + error_log /log/error.log error; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/files/galleri.jpg b/files/galleri.jpg new file mode 100644 index 0000000..5bc5136 Binary files /dev/null and b/files/galleri.jpg differ diff --git a/files/googled2a7a9aeee680deb.html b/files/googled2a7a9aeee680deb.html new file mode 100644 index 0000000..8a9ec39 --- /dev/null +++ b/files/googled2a7a9aeee680deb.html @@ -0,0 +1 @@ +google-site-verification: googled2a7a9aeee680deb.html \ No newline at end of file diff --git a/files/googlehostedservice.html b/files/googlehostedservice.html new file mode 100644 index 0000000..11f0162 --- /dev/null +++ b/files/googlehostedservice.html @@ -0,0 +1 @@ +googleffffffffe33a2cf0 diff --git a/files/index.html b/files/index.html new file mode 100644 index 0000000..7cc2699 --- /dev/null +++ b/files/index.html @@ -0,0 +1,31 @@ + + Lingonpaj + + + + + + + + + +

+ +
+ +	+ +

+ + + + + diff --git a/files/java.jpg b/files/java.jpg new file mode 100755 index 0000000..cf700d4 Binary files /dev/null and b/files/java.jpg differ diff --git a/files/laaneord.mp3 b/files/laaneord.mp3 new file mode 100755 index 0000000..e7de37a Binary files /dev/null and b/files/laaneord.mp3 differ diff --git a/files/logo.jpg b/files/logo.jpg new file mode 100755 index 0000000..5d4ccae Binary files /dev/null and b/files/logo.jpg differ diff --git a/files/mail.jpg b/files/mail.jpg new file mode 100755 index 0000000..eaa2b4e Binary files /dev/null and b/files/mail.jpg differ diff --git a/files/sprangning/index.html b/files/sprangning/index.html new file mode 100644 index 0000000..151a6f0 --- /dev/null +++ b/files/sprangning/index.html @@ -0,0 +1,9 @@ + + Sprängningarna + + Första salvan
+ Andra salvan
+ Tredje och sista salvan
+ + + diff --git a/files/sprangning/salva1.avi b/files/sprangning/salva1.avi new file mode 100644 index 0000000..89f54aa Binary files /dev/null and b/files/sprangning/salva1.avi differ diff --git a/files/sprangning/salva2.avi b/files/sprangning/salva2.avi new file mode 100644 index 0000000..c825f58 Binary files /dev/null and b/files/sprangning/salva2.avi differ diff --git a/files/sprangning/salva3.avi b/files/sprangning/salva3.avi new file mode 100644 index 0000000..42a7393 Binary files /dev/null and b/files/sprangning/salva3.avi differ