diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-02-24 17:37:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 17:37:57 +0100 |
| commit | 73ceaaafa9e7f14c25ccafe0789ba89933ab7b14 (patch) | |
| tree | 8c362e69deb333230226a48e23fa97a73910d455 | |
| parent | 42e758dde8e084ebb336f995b9b0af3bf4a82d96 (diff) | |
| parent | d3fa059264bff04c5ea8ee3e03dab4d5cdf6e83d (diff) | |
| download | vyos-1x-73ceaaafa9e7f14c25ccafe0789ba89933ab7b14.tar.gz vyos-1x-73ceaaafa9e7f14c25ccafe0789ba89933ab7b14.zip | |
Merge pull request #1848 from sever-sever/T5029
T5029: Change nginx default root directory
| -rw-r--r-- | data/templates/https/nginx.default.j2 | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | debian/vyos-1x.install | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/data/templates/https/nginx.default.j2 b/data/templates/https/nginx.default.j2 index 3463bc37d..d42b3b389 100644 --- a/data/templates/https/nginx.default.j2 +++ b/data/templates/https/nginx.default.j2 @@ -16,6 +16,8 @@ server { server_name {{ name }}; {% endfor %} + root /srv/localui; + {% if server.certbot %} ssl_certificate {{ server.certbot_dir }}/live/{{ server.certbot_domain_dir }}/fullchain.pem; ssl_certificate_key {{ server.certbot_dir }}/live/{{ server.certbot_domain_dir }}/privkey.pem; diff --git a/debian/rules b/debian/rules index 5a58aeeb6..55e02fae6 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ VYOS_DATA_DIR := usr/share/vyos VYOS_CFG_TMPL_DIR := opt/vyatta/share/vyatta-cfg/templates VYOS_OP_TMPL_DIR := opt/vyatta/share/vyatta-op/templates VYOS_MIBS_DIR := usr/share/snmp/mibs +VYOS_LOCALUI_DIR := srv/localui MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system @@ -89,6 +90,9 @@ override_dh_auto_install: mkdir -p $(DIR)/$(VYOS_DATA_DIR) cp -r data/* $(DIR)/$(VYOS_DATA_DIR) + # Create localui dir + mkdir -p $(DIR)/$(VYOS_LOCALUI_DIR) + # Install SNMP MIBs mkdir -p $(DIR)/$(VYOS_MIBS_DIR) cp -d mibs/* $(DIR)/$(VYOS_MIBS_DIR) diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install index 6b5c7793d..98d1bc0cd 100644 --- a/debian/vyos-1x.install +++ b/debian/vyos-1x.install @@ -18,6 +18,7 @@ etc/update-motd.d etc/vyos lib/ opt/ +srv/localui usr/sbin usr/bin/config-mgmt usr/bin/initial-setup |