- moved ssl key generation into container

- mount html and webdav as volume
2025-02-23 13:31:02 +01:00
parent 0c30086b37
commit 4deb3de6eb
8 changed files with 6 additions and 72 deletions
@@ -6,18 +6,9 @@ RUN apt-get update && \
    apt-get install -y vim && \
    rm -rf /var/lib/apt/lists/*

+RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/localhost.key -out /etc/ssl/certs/localhost.crt -subj "/C=US/ST=YourState/L=YourCity/O=YourOrganization/CN=localhost"
 RUN htpasswd -nb davuser davuser > /var/www/.htpasswd

-# Copy your PHP application into the default Apache document root
-COPY ./public-html/ /var/www/html/
-COPY ./webdav/ /var/www/webdav/
-
-RUN chown -R root:www-data /var/www/
-
-# Copy SSL certificate and key
-COPY ssl/localhost.crt /etc/ssl/certs/localhost.crt
-COPY ssl/localhost.key /etc/ssl/private/localhost.key
-
 # Copy the custom Apache virtual host config
 COPY conf/my-httpd-vhosts.conf /etc/apache2/sites-available/my-ssl.conf
 COPY conf/webdav.conf /etc/apache2/sites-available/webdav.conf
@@ -1,5 +1,2 @@
 #!/usr/bin/env bash
-mkdir -p ssl
-openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ssl/localhost.key -out ssl/localhost.crt -subj "/C=US/ST=YourState/L=YourCity/O=YourOrganization/CN=localhost"
-
 docker buildx build -t my-httpd .
@@ -1,4 +1,4 @@
-DavLockDB "/var/www/html/DavLock"
+DavLockDB "/var/www/DavLock"
 LogLevel debug


@@ -6,7 +6,6 @@ Alias /webdav "/var/www/webdav"
 <Directory "/var/www/webdav/">
 	Options Indexes FollowSymLinks
 	AllowOverride None
-	Require all granted

 	# Enable WebDAV
 	DAV On
@@ -31,7 +30,3 @@ Alias /webdav "/var/www/webdav"

 </Directory>

-<Location "/webdav">
-    Dav On
-    ForceType text/plain
-</Location>
@@ -1,6 +1,6 @@
 <!-- #######  YAY, I AM THE SOURCE EDITOR! #########-->
 <html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><h1 style="color: #5e9ca0;">Willkommen to Jayfield.org!</h1>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><h1 style="color: #5e9ca0;">Willkommen auf Jayfield.org!</h1>
 <h2 style="color: #2e6c80;">Yet another website:</h2>
 <p>I just setup a apache webserver on a virtual server on the net. Now, 
 what to do with that? Nothing, interesting. I will try to create a small
@@ -1,3 +1,4 @@
-docker run -dit --rm --name my-apache-app -p 80:80 -p 443:443 my-httpd
-# docker run -dit --rm --name my-apache-app -p 80:80 -p 443:443 my-httpd -v ./html:/var/www/html/ -v ./webdav:/var/www/webdav/
+sudo chown -R root:www-data ./public-html/
+sudo chown -R root:www-data ./webdav/
+docker run -dit --rm --name my-apache-app -p 80:80 -p 443:443 -v ./public-html/:/var/www/html -v ./webdav/:/var/www/webdav my-httpd

@@ -1,22 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDpzCCAo+gAwIBAgIUUFs/vZMkU1C6aRcQzeVWRww/5UEwDQYJKoZIhvcNAQEL
-BQAwYzELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCVlvdXJTdGF0ZTERMA8GA1UEBwwI
-WW91ckNpdHkxGTAXBgNVBAoMEFlvdXJPcmdhbml6YXRpb24xEjAQBgNVBAMMCWxv
-Y2FsaG9zdDAeFw0yNTAyMjIxMTEzMThaFw0yNjAyMjIxMTEzMThaMGMxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIDAlZb3VyU3RhdGUxETAPBgNVBAcMCFlvdXJDaXR5MRkw
-FwYDVQQKDBBZb3VyT3JnYW5pemF0aW9uMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdt1QByZZo38ycN32dGCigrGJh
-a6DIza50xcKvDUw+3drfwywz09Ji7oQbiKAqziugSepvBb6nyP3z3OI6NsJHysvA
-HaHmJOlY0NZ5Pp1yUDZpW7dHBnzADakMYU1CA9dRzOIrsAdLVa5zhgdkAX2PzoR4
-WsAP95tDb3KRtoavvhQRBs8FjvjQujSIXrozygSYsPeLDpOrq5LqOmr9DzFshZ/H
-6wgp7ZhC8uESNP3X/Ixgfr9i0Bwh7SJOHjm3rAIXBuQlO3sjIsajWjv/l36f3Qyp
-EmbxiIitlGI0Ldlr7gcq4koATKgl7vJGdCNrQZex+oEVagKTYLzowqpoatchAgMB
-AAGjUzBRMB0GA1UdDgQWBBQwZ84vq0Z7lvZYEno6yup0htvlXTAfBgNVHSMEGDAW
-gBQwZ84vq0Z7lvZYEno6yup0htvlXTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAnUkiVsITM3RqIp0p5P8pch8CkgbG+EFyAVV/f8N13T1l+HOJk
-2QeE9tXzVjHohGZ3XVhVGv1CjeR/yF6r1x/lLR2o1rWAeT0wBZ2aAnYa8tcV3c/A
-774eWG6Eznl/T1cIFmHIFcBNyMIfc/zq3oYEjaTSHwaKapsj4dbKFo4bHjrrJRFv
-QiFHwnT9dd7l3JD3Xt0KaJS4F2WyoFsaIi2fmLVNSUptoywDBVQz+JM7q3qToFzH
-joTKjMTF8MNSmhbyC3TrfogsRkYFxGi7z/P7JLWgg7gGqvgFyPeyq3XbsijTblMA
-ktMLKXbCSLt2r4ZmcXkGAiSIrN1swF9sRkpj
-----END CERTIFICATE-----
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCdt1QByZZo38yc
-N32dGCigrGJha6DIza50xcKvDUw+3drfwywz09Ji7oQbiKAqziugSepvBb6nyP3z
-3OI6NsJHysvAHaHmJOlY0NZ5Pp1yUDZpW7dHBnzADakMYU1CA9dRzOIrsAdLVa5z
-hgdkAX2PzoR4WsAP95tDb3KRtoavvhQRBs8FjvjQujSIXrozygSYsPeLDpOrq5Lq
-Omr9DzFshZ/H6wgp7ZhC8uESNP3X/Ixgfr9i0Bwh7SJOHjm3rAIXBuQlO3sjIsaj
-Wjv/l36f3QypEmbxiIitlGI0Ldlr7gcq4koATKgl7vJGdCNrQZex+oEVagKTYLzo
-wqpoatchAgMBAAECggEAIs0hhRxzq1QY7O6kse2zB1NKiScr7StPn9ZEgYaMaMHh
-KmeBgTUwMyLg9UdmWlOwljfBOnrYyWLFQNKge8p5/8f8wjl3sFY8RFweu1XI/cC7
-5O83R72jeOh6wS/WUacR0+vDC3NWBLZVHoo4ZsWabIlcO0eBInTXZp+4tvUBDtWo
-nU64Kz9q2NVL6eSAA/fLR8eMnxXJWgLUkULf6Msee29brHDHvq7XiI5TOFWJrIk0
-h4tW4KPaSZ4S74bqHts22wd9XEbpHmJTEDcJx0uTmg8Oey6+laDsFZkGwcCKq584
-70aB2J4zqA4yKcIEestUh0NG7wcWLOhEFCDr6zLhnQKBgQDMAa1rEUCtkwUp3gYn
-0HVi4x9nZhx3Za4ddRuzqX6QMFfmAnjMWoUgsqiaVrMWrfW7IvGyevMBADAMaPSE
-CyEQsbhuiTXeJUKsjXIZo/aLE5M2DHlrGq8FIemQ8jattpVJP1ZI40vzIPgZC6+Z
-tVgrkHxZCDz0p6q9+z1VLMTQzQKBgQDF6XN7/Gu/yQp3DMg7WrVbqeWW8tPE/rHN
-K/KjasE0eXjLqKUlqR226Mqxrd4WqJseZGxr9IMxIvHguDSpFAwywyME/GlcFtUd
-L+6axe0DC0vnha6iMjZIy4yTRr+t47heovRYVMlvYvVLtBamrxztLQQhOMW9Nfgt
-Qc+qMaVPpQKBgDRCKb5HiR3tj2EOMt14FNnj/GNsUNZ1AYkiOppnTLh66clN0Mvo
-VDnwCiifFPk2TsBFT0y9GgqjlatYJ2q7vxibrfcCxv3E5bN1+EiBK+KsfQVXZLL+
-/t59tWsf4MnW/57nzp6VOxto0qT3zV++iHuAY5oa9iJl4OMRvMBY24HxAoGBAI9F
-T9+6vPnKfPPv4eft44om9NiQkzNxuZ8wqGcauiDVqtesD1mzEpq97TYxCqxWhGy9
-ACwqhuqERJuMXjrkE2yQDQLoAxGySbbmYxHSJKDmhZ1mDiTGurt59xsKxWoJhwej
-acWkI2qqNa8HALrL2+Hqi6nNIoC12CJTGRU4+VYtAoGAVOFAutcAo+Teplu3uKz2
-IhHhcwD0dB+mvhpyHO+2FyjAvPYbzw81QHZTo0Y7pA/WSUBNlCB1hfhaVR0bxPtb
-7zUIB257mfLlzmvJuEmo4w6VKSBJpu0qK/dO29Bh+oddbcZdWrjDl4afCORBHcxa
-6WGLHjk72AxUGPmjcRx6+MM=
-----END PRIVATE KEY-----