Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First steps to nginx config template #4397

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
db653d2
moderately mature template
acozine Oct 11, 2023
33021fb
add first template-able sites to vars/main.yml
acozine Oct 11, 2023
52fb90b
tasks for site config template and vars
acozine Oct 11, 2023
c92c0f8
we are not using stream config
acozine Oct 11, 2023
b976602
testing showed us we needed these fixes
acozine Oct 16, 2023
204623a
fix typo
acozine Oct 17, 2023
2a6111e
fix template to work for bibdata-staging config
acozine Oct 19, 2023
f5fff9c
adds fields for proxy timeouts, configures for bibdata and default
acozine Nov 3, 2023
18bc3d6
Set proxy_*_timeout defaults in the template, rather than variables
sandbergja Nov 3, 2023
987bc1b
add dir and task for dynamic (template-driven) config files for nginx
acozine Nov 6, 2023
4f85e95
Dynamic config upload should have the update-conf tag
sandbergja Nov 6, 2023
a391b6e
Update dynamic nginx config to include new abid boxes
sandbergja Nov 6, 2023
20633f0
Use dynamic configs for some servers, but comment out abid-prod
sandbergja Nov 6, 2023
4f81e67
first attempt to clear deleted files gracefully
acozine Dec 5, 2023
625dc60
hm, try something different
acozine Dec 5, 2023
0e6b209
next thing
acozine Dec 5, 2023
8335250
can we get specific data?
acozine Dec 5, 2023
1f0b9a4
like this?
acozine Dec 5, 2023
3e1d006
simpler yet
acozine Dec 5, 2023
0130d7c
loop!
acozine Dec 5, 2023
b0a01ea
restore view
acozine Dec 5, 2023
0f10617
needs curly braces?
acozine Dec 5, 2023
86f3f54
and not here?
acozine Dec 5, 2023
f973a9a
is this better?
acozine Dec 7, 2023
fd1cf7f
yeehaw this works!
acozine Dec 22, 2023
e975a0f
tidy var names
acozine Dec 22, 2023
3527d2e
oops, tidy that last task too
acozine Dec 22, 2023
df64ab6
find and delete obsolete static config files, so we do not have to de…
acozine Dec 22, 2023
caaf0e3
do not make backups of nginx configs, unknown files will bork the server
acozine Dec 22, 2023
61236ce
adds tag for testing templated configs, so we get the registered var
acozine Feb 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions roles/nginxplus/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ nginx_main_upload_enable: false
# Upload HTTP NGINX configuration files.
# Set to false for testing
nginx_http_upload_enable: false
nginx_http_upload_src: conf/http/*.conf
nginx_http_upload_dest: /etc/nginx/conf.d/
nginx_http_dynamic_config_dest: /etc/nginx/conf.d/dynamic
# Upload Stream NGINX configuration files.
nginx_stream_upload_enable: false
nginx_stream_upload_src: conf/stream/*.conf
nginx_stream_upload_dest: /etc/nginx/conf.d/
# Upload HTML files.
# Set to false for testing
nginx_html_upload_enable: false
Expand Down Expand Up @@ -431,3 +438,9 @@ nginx_stream_template:
port: 8080
weight: 1
health_check: max_fails=1 fail_timeout=10s

# manage the hash table that stores server names for fast lookup
# increase the size first, when that stops working, increase the number of hash buckets in the table
nginx_server_names_hash_bucket_size: 64
nginx_server_names_hash_max_size: 1024
client_max_body_size: 0
57 changes: 0 additions & 57 deletions roles/nginxplus/files/conf/http/abid_staging.conf

This file was deleted.

54 changes: 0 additions & 54 deletions roles/nginxplus/files/conf/http/allsearch-api_prod.conf

This file was deleted.

60 changes: 0 additions & 60 deletions roles/nginxplus/files/conf/http/allsearch-api_staging.conf

This file was deleted.

55 changes: 0 additions & 55 deletions roles/nginxplus/files/conf/http/bibdata_staging.conf

This file was deleted.

Loading
Loading