Commit Graph

21 Commits

Author SHA1 Message Date
Jason Ertel
82a7b7e02d Upgrade to Kratos 0.5.3-alpha1 2020-11-03 11:50:25 -05:00
William Wernert
b489fee8b5 Merge pull request #1738 from Security-Onion-Solutions/bugfix/nginx-redirect
Bugfix/nginx redirect
2020-10-29 14:33:38 -04:00
William Wernert
91221c4332 [revert] Move proxy_pass back to ip 2020-10-29 10:23:12 -04:00
Jason Ertel
98c669e80b Disable nginx server version and TLSv1.0/TLSv1.1 2020-10-28 14:29:29 -04:00
William Wernert
0aaf8d6d9a [fix] Change 301 to 307 so curl requests work as intended 2020-10-26 16:37:16 -04:00
William Wernert
4662837075 [fix] Revert changes from merging dev 2020-10-26 10:25:16 -04:00
William Wernert
fdb7cb90e3 [wip] Test alt variable usage 2020-10-23 15:36:01 -04:00
William Wernert
73b83584e6 [fix] Remove bad '_' character 2020-10-23 14:32:43 -04:00
William Wernert
6a08086dfa [refactor] Make variable names consistent 2020-10-22 14:10:06 -04:00
William Wernert
6a3e921924 [fix] Fixes for fleet install 2020-10-22 13:09:26 -04:00
William Wernert
79c4f07ff7 [fix] Don't listen on port 80 on all installs 2020-10-22 10:43:24 -04:00
William Wernert
d63358c8f0 [fix] Correct pillar reference + nginx errors 2020-10-20 14:30:06 -04:00
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