William Wernert
|
42e285cfbe
|
Merge branch 'dev' into feature/nginx-update
# Conflicts:
# salt/nginx/etc/nginx.conf
# salt/nginx/etc/nginx.conf.so-eval
# salt/nginx/etc/nginx.conf.so-manager
# salt/nginx/etc/nginx.conf.so-standalone
|
2020-10-19 13:25:46 -04:00 |
|
William Wernert
|
a5c790c31e
|
[fix] managerr -> manager
|
2020-07-10 17:50:53 -04:00 |
|
William Wernert
|
8b146aac32
|
Merge branch 'dev' into feature/nginx-update
# Conflicts:
# salt/nginx/etc/nginx.conf
# salt/nginx/etc/nginx.conf.so-eval
# salt/nginx/etc/nginx.conf.so-manager
# salt/nginx/etc/nginx.conf.so-managersearch
# salt/nginx/etc/nginx.conf.so-mastersearch
# salt/nginx/etc/nginx.conf.so-standalone
|
2020-07-10 17:49:34 -04:00 |
|
William Wernert
|
81006ebbd0
|
[fix] Reflect new manager syntax
|
2020-07-10 17:46:15 -04:00 |
|
William Wernert
|
49e5cb311e
|
[fix][WIP] set ssl cert for redirect 443 server block
|
2020-07-08 16:05:48 -04:00 |
|
William Wernert
|
533ed395e7
|
[fix][WIP] Remove ssl and http2 from redirect server block
|
2020-07-08 15:59:31 -04:00 |
|
William Wernert
|
a0ffe26334
|
[fix] Only one default_server is allowed per port
|
2020-07-08 15:56:36 -04:00 |
|
William Wernert
|
0c3e35c55e
|
[fix] correct jinja template syntax
|
2020-07-08 14:30:27 -04:00 |
|
William Wernert
|
cfd1b82e00
|
[refactor] Redirect to correct url_base + combine configs
|
2020-07-08 13:49:33 -04:00 |
|