Baguette
/
service
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'nginx' of ssh://git.karchnu.fr:2202/WeirdOS/service into nginx

master
Luka Vandervelden 2019-10-29 12:33:27 +01:00
parent 6ee52f5baa 56ffb39cc5
commit b202aa2b5c
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/gitea.spec
View File

@ -1,5 +1,5 @@
command: gitea -C . -w . -c ./custom/conf/app.ini command: gitea -C . -w . -c ./custom/conf/app.ini
consumes: postgresql consumes: postgresql, http?
requires-domain: true requires-domain: true
ports: http ports: http

18
templates/nginx.conf.j2
View File

@ -23,8 +23,8 @@ http {
{% for user in consumers["www"] %} {% for user in consumers["www"] %}
server { server {
listen {{ port(user.id) }} ; listen {{ port(service.id) }} ;
listen [::]:{{ port(user.id) }} ; listen [::]:{{ port(service.id) }} ;
server_name {{ user.domain }} ; server_name {{ user.domain }} ;
location / { location / {
@ -33,4 +33,18 @@ http {
} }
{% endfor %} {% endfor %}
{% for user in consumers["http"] %}
server {
listen {{ port(service.id) }};
listen [::]:{{ port(service.id) }};
server_name {{ user.domain }} *.{{ user.domain }};
location / {
proxy_set_header Host $host;
proxy_next_upstream_timeout 2s;
proxy_pass http://127.0.0.1:{{ port(user.id) }}/;
}
}
{% endfor %}
} }