summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-12-06 20:57:20 +0100
committerChristian Poessinger <christian@poessinger.com>2021-12-09 23:36:20 +0100
commitfc7b8a225879a216788b68fefba5390e9d9f0ee4 (patch)
tree1d998441ca518f4e0cdacaf339d8fae500af22be /src
parent977dbf6b9452a81e7f04789182f852afe5f3a0bd (diff)
downloadvyos-1x-fc7b8a225879a216788b68fefba5390e9d9f0ee4.tar.gz
vyos-1x-fc7b8a225879a216788b68fefba5390e9d9f0ee4.zip
https: T4055: add vrf support
(cherry picked from commit 955f260ce682d64d27b3b11e618b1ae0176e4b91)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/https.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index a6e2d9c8c..05f245509 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -22,6 +22,7 @@ import vyos.defaults
import vyos.certbot_util
from vyos.config import Config
+from vyos.configverify import verify_vrf
from vyos import ConfigError
from vyos.util import call
from vyos.template import render
@@ -30,6 +31,7 @@ from vyos import airbag
airbag.enable()
config_file = '/etc/nginx/sites-available/default'
+systemd_override = r'/etc/systemd/system/nginx.service.d/override.conf'
certbot_dir = vyos.defaults.directories['certbot']
# https config needs to coordinate several subsystems: api, certbot,
@@ -150,6 +152,8 @@ def verify(https):
return None
raise ConfigError("At least one 'virtual-host <id> server-name' "
"matching the 'certbot domain-name' is required.")
+
+ verify_vrf(https)
return None
def generate(https):
@@ -160,10 +164,13 @@ def generate(https):
https['server_block_list'] = [default_server_block]
render(config_file, 'https/nginx.default.tmpl', https)
+ render(systemd_override, 'https/override.conf.tmpl', https)
return None
def apply(https):
+ # Reload systemd manager configuration
+ call('systemctl daemon-reload')
if https is not None:
call('systemctl restart nginx.service')
else: