diff --git a/docker-compose.yml b/docker-compose.yml index 15807dd..799e98f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,6 +62,18 @@ services: expose: - 8083 + wallabag: + image: wallabag/wallabag + container_name: wallabag + restart: unless-stopped + env_file: + - ./wallabag/wallabag.env + volumes: + - ./wallabag/images:/var/www/wallabag/web/assets/images + - ./wallabag/data:/var/www/wallabag/data + expose: + - 80 + gitea: image: gitea/gitea:latest container_name: gitea diff --git a/letsencrypt/nginx/proxy-confs/wallabag.subdomain.conf b/letsencrypt/nginx/proxy-confs/wallabag.subdomain.conf new file mode 100644 index 0000000..246697f --- /dev/null +++ b/letsencrypt/nginx/proxy-confs/wallabag.subdomain.conf @@ -0,0 +1,33 @@ +# make sure that your dns has a cname set for wallabag and that your wallabag container is not using a base url + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name wallabag.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth + #auth_request /auth; + #error_page 401 =200 /login; + + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_app wallabag; + set $upstream_port 80; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + + } +} diff --git a/wallabag/wallabag.env b/wallabag/wallabag.env new file mode 100644 index 0000000..b6c1d21 --- /dev/null +++ b/wallabag/wallabag.env @@ -0,0 +1 @@ +SYMFONY__ENV__DOMAIN_NAME=https://wallabag.belanyi.fr