diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-05 18:27:55 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-05 18:28:10 +0200 |
| commit | 220f375b111bfb4cccb02f7a4f893046f1aa5d36 (patch) | |
| tree | f4dc7d23c2e881e8ba7836cc9c5a22376c76640d | |
| parent | a6100cde7c9f045175b5c958055df59bab6afe1a (diff) | |
| download | vyos-1x-220f375b111bfb4cccb02f7a4f893046f1aa5d36.tar.gz vyos-1x-220f375b111bfb4cccb02f7a4f893046f1aa5d36.zip | |
dhcp-server: T2230: rename template dir from dhcp -> dhcp-server
| -rw-r--r-- | data/templates/dhcp-server/daemon.tmpl (renamed from data/templates/dhcp/daemon.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/dhcp-server/dhcpd.conf.tmpl (renamed from data/templates/dhcp/dhcpd.conf.tmpl) | 0 | ||||
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/data/templates/dhcp/daemon.tmpl b/data/templates/dhcp-server/daemon.tmpl index f88032d38..f88032d38 100644 --- a/data/templates/dhcp/daemon.tmpl +++ b/data/templates/dhcp-server/daemon.tmpl diff --git a/data/templates/dhcp/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl index 5f5129451..5f5129451 100644 --- a/data/templates/dhcp/dhcpd.conf.tmpl +++ b/data/templates/dhcp-server/dhcpd.conf.tmpl diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py index c4b0c4074..3d75414f5 100755 --- a/src/conf_mode/dhcp_server.py +++ b/src/conf_mode/dhcp_server.py @@ -603,7 +603,7 @@ def generate(dhcp): return None # Prepare Jinja2 template loader from files - tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcp') + tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcp-server') fs_loader = FileSystemLoader(tmpl_path) env = Environment(loader=fs_loader) |