From a33d3032c5ef1faa377bab9c342a99ed476922fa Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Wed, 27 Nov 2024 09:04:49 +0100 Subject: [PATCH] remove lighttpd --- docker-compose.lighttpd.yml | 10 ------ docker-compose.yml | 1 - lighttpd/etc/.lighttpdpassword | 1 - lighttpd/etc/lighttpd/blog.conf | 26 -------------- lighttpd/etc/lighttpd/global.conf | 57 ------------------------------ nginx/etc/nginx/conf.d/global.conf | 10 ------ 6 files changed, 105 deletions(-) delete mode 100644 docker-compose.lighttpd.yml delete mode 100644 lighttpd/etc/.lighttpdpassword delete mode 100644 lighttpd/etc/lighttpd/blog.conf delete mode 100644 lighttpd/etc/lighttpd/global.conf diff --git a/docker-compose.lighttpd.yml b/docker-compose.lighttpd.yml deleted file mode 100644 index 5f05e9b..0000000 --- a/docker-compose.lighttpd.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - lighttpd: - container_name: lighttpd - image: sebp/lighttpd:1.4.64-r0 - ports: - - 80:80 - restart: unless-stopped - tty: true - volumes: - - /home/user/www:/var/www/localhost/htdocs diff --git a/docker-compose.yml b/docker-compose.yml index 9c64943..33941bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ include: # Web - docker-compose.caddy.yml -- docker-compose.lighttpd.yml - docker-compose.nginx.yml # Authentication diff --git a/lighttpd/etc/.lighttpdpassword b/lighttpd/etc/.lighttpdpassword deleted file mode 100644 index 7553633..0000000 --- a/lighttpd/etc/.lighttpdpassword +++ /dev/null @@ -1 +0,0 @@ -user:dummy diff --git a/lighttpd/etc/lighttpd/blog.conf b/lighttpd/etc/lighttpd/blog.conf deleted file mode 100644 index a4e7afa..0000000 --- a/lighttpd/etc/lighttpd/blog.conf +++ /dev/null @@ -1,26 +0,0 @@ -server.modules += ("mod_accesslog", "mod_alias") - -$SERVER["socket"] == ":1992" { - accesslog.filename = "/host/var/log/lighttpd/blog-lara.log" - server.document-root = "/host/var/www/blog/lara/site" - alias.url = ("/asset" => "/host/var/www/blog/lara/asset") - server.errorfile-prefix = "/host/var/www/blog/lara/site/error/http-" - - # Authentication - auth.backend = "plain" - auth.backend.plain.userfile = "/host/etc/.lighttpdpassword" - auth.require = ( - "/" => ( - "method" => "basic", - "realm" => "Password protected area", - "require" => "valid-user" - ) - ) -} - -$SERVER["socket"] == ":3838" { - accesslog.filename = "/host/var/log/lighttpd/blog-scotland.log" - server.document-root = "/host/var/www/blog/scotland/site" - alias.url = ("/asset" => "/host/var/www/blog/scotland/asset") - server.errorfile-prefix = "/host/var/www/blog/scotland/site/error/http-" -} diff --git a/lighttpd/etc/lighttpd/global.conf b/lighttpd/etc/lighttpd/global.conf deleted file mode 100644 index cbfeb0a..0000000 --- a/lighttpd/etc/lighttpd/global.conf +++ /dev/null @@ -1,57 +0,0 @@ -server.modules += ("mod_auth", "mod_setenv") - -$SERVER["socket"] == ":81" { - server.document-root = "/host/var/www/global" - auth.backend = "plain" - auth.backend.plain.userfile = "/host/etc/.lighttpdpassword" - - $HTTP["url"] !~ "^(/public/.*|/.well-known/.*)" { - auth.require = ( - "/" => ( - "method" => "basic", - "realm" => "Password protected area", - "require" => "valid-user" - ) - ) - } -} - -$SERVER["socket"] == ":443" { - server.document-root = "/host/var/www/global" - - # Enable SSL - ssl.engine = "enable" - ssl.pemfile = "/host/etc/certs/key+certificate.pem" - ssl.ca-file = "/host/etc/certs/intermediate.pem" - ssl.dh-file = "/host/etc/certs/dh.pem" - - # Increased security, from https://cipherli.st/ - ssl.honor-cipher-order = "enable" - ssl.cipher-list = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH" - setenv.add-response-header = ( - "Strict-Transport-Security" => "max-age=63072000; includeSubdomains; preload", - "X-Frame-Options" => "DENY", - "X-Content-Type-Options" => "nosniff" - ) - ssl.use-sslv2 = "disable" - ssl.use-sslv3 = "disable" - - # Increased security, from https://raymii.org/s/tutorials/HTTP_Strict_Transport_Security_for_Apache_NGINX_and_Lighttpd.html - $HTTP["scheme"] == "https" { - setenv.add-response-header = ( - # "Strict-Transport-Security" => "max-age=63072000; includeSubdomains; preload", - "X-Frame-Options" => "DENY" - ) - } - - # Authentication - auth.backend = "plain" - auth.backend.plain.userfile = "/host/etc/.lighttpdpassword" - auth.require = ( - "/" => ( - "method" => "basic", - "realm" => "Password protected area", - "require" => "valid-user" - ) - ) -} diff --git a/nginx/etc/nginx/conf.d/global.conf b/nginx/etc/nginx/conf.d/global.conf index db11477..ded1424 100644 --- a/nginx/etc/nginx/conf.d/global.conf +++ b/nginx/etc/nginx/conf.d/global.conf @@ -1,13 +1,3 @@ -server { - listen 80; - - location / { - # lighttpd - proxy_pass http://host:80; - include /etc/nginx/conf/proxy.conf; - } -} - server { # test listen 80;