nginx: mount volume to /etc/nginx/conf.d

the recent change to nginxproxy repos made nginxproxy/docker-gen unneeded, as it's now bundled in nginxproxy/nginx-proxy. This makes the template file useless too, and custom configurations for nginx have to be mounted to /etc/nginx/conf.d of the container as per wiki

+ update README accordingly and upload current config file
master
EmaMaker 2022-01-07 11:29:18 +00:00
parent 4be02088a0
commit 564dfb63eb
3 changed files with 6 additions and 18 deletions

View File

@ -22,7 +22,7 @@ Also note that systemd entries use docker installed from snap (stored in /var/sn
https://gist.github.com/mosquito/b23e1c1e5723a7fd9e6568e5cf91180f
* gitea: contains app.ini config file for gitea. Place it in $GITEA_DATADIR/gitea/conf/
* nginx: contains nginx template. $NGINX_TMPL needs to point to it.
* nginx: contains custom nginx configs. $NGINX_CONF_DIR needs to point to it.
* ddclient: DDClient config script, location depends on the distro. Activate its systemd entry. DDclient updates the dns record with the public ip of the machine. I use google domains so it's configured for that, stripped down of the creds of course. Examples for different services can be found on the ddclient wiki.
@ -71,10 +71,9 @@ These are the available environment variables:
### Gitea
* **GITEA_DATADIR**: directory where gitea data will be stored
* **GITEA_CONFIGDIR**: directory where gutea config will be stored. Copy you app.ini here
### Nginx
* **NGINX_TMPL**: nginx template
* **NGINX_CONF_DIR**: custom nginx configurations
### Nextcloud
@ -85,4 +84,4 @@ These are the available environment variables:
* **NEXTCLOUD_ADMIN_USER**
* **NEXTCLOUD_ADMIN_PWD**
* **NEXTCLOUD_MYSQL_ROOTPWD**
* **NEXTCLOUD_MYSQL_PWD**
* **NEXTCLOUD_MYSQL_PWD**

View File

@ -1,3 +1,4 @@
version: "2"
services:
@ -9,24 +10,11 @@ services:
- "80:80"
- "443:443"
volumes:
- "/etc/nginx/conf.d"
- "/etc/nginx/vhost.d"
- "/usr/share/nginx/html"
- "/var/run/docker.sock:/tmp/docker.sock:ro"
- "$CERTS_DIR:/etc/nginx/certs:ro"
nginx-gen:
restart: always
image: nginxproxy/docker-gen
container_name: nginx-gen
volumes:
- "/var/run/docker.sock:/tmp/docker.sock:ro"
- "$NGINX_TMPL:/etc/docker-gen/templates/nginx.tmpl:ro"
networks:
- default
volumes_from:
- nginx
entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
- "$NGINX_CONF_DIR:/etc/nginx/conf.d"
acme-companion:
restart: always

1
nginx/my-nginx-conf.conf Normal file
View File

@ -0,0 +1 @@
client_max_body_size 20G;