Migrate declarative configs to config/ dir and remove hardcoded paths
Replace all hardcoded /home/wall/vacuum-wall paths in lib/ with Path(__file__).resolve()
auto-discovery. Move config files from data/ to config/<subsystem>/config.json.
ACME now uses ACME_HOME env var and data/acme/ for cert storage. Systemd units
and sudoers use {{ USER_NAME }}, {{ PROJECT_DIR }}, {{ ACME_HOME }} Jinja2
template variables for install-time substitution. Remove sys.path.insert boot
strap from test files.
This commit is contained in:
@@ -21,21 +21,21 @@ server {
|
||||
{% if cert.type == "acme" %}
|
||||
# Certificate managed by acme.sh
|
||||
{% if cert.email %} # ACME contact: {{ cert.email }}
|
||||
{% endif %} ssl_certificate /home/vacuum-wall/.acme.sh/{{ domain }}/fullchain.cer;
|
||||
ssl_certificate_key /home/vacuum-wall/.acme.sh/{{ domain }}/{{ domain }}.key;
|
||||
{% endif %} ssl_certificate {{ acme_home }}/{{ domain }}/fullchain.cer;
|
||||
ssl_certificate_key {{ acme_home }}/{{ domain }}/{{ domain }}.key;
|
||||
|
||||
{% elif cert.type == "file" %}
|
||||
ssl_certificate {{ cert.path }};
|
||||
ssl_certificate_key {{ cert.key_path }};
|
||||
|
||||
{% elif cert.type == "selfsigned" %}
|
||||
ssl_certificate /home/wall/vacuum-wall/data/certs/{{ domain }}.crt;
|
||||
ssl_certificate_key /home/wall/vacuum-wall/data/certs/{{ domain }}.key;
|
||||
ssl_certificate {{ certs_dir }}/{{ domain }}.crt;
|
||||
ssl_certificate_key {{ certs_dir }}/{{ domain }}.key;
|
||||
|
||||
{% endif %}
|
||||
{% elif is_management %}
|
||||
ssl_certificate /home/wall/vacuum-wall/data/certs/{{ domain }}.crt;
|
||||
ssl_certificate_key /home/wall/vacuum-wall/data/certs/{{ domain }}.key;
|
||||
ssl_certificate {{ certs_dir }}/{{ domain }}.crt;
|
||||
ssl_certificate_key {{ certs_dir }}/{{ domain }}.key;
|
||||
|
||||
{% endif %}
|
||||
# Shared SSL settings
|
||||
|
||||
Reference in New Issue
Block a user