Merge pull request #332 from thomas-mangin/T2230

template: T2230: use render to generate templates

1 files changed, 2 insertions, 11 deletions

diff --git a/src/conf_mode/ssh.py b/src/conf_mode/ssh.py
index a6cdb7ccc..ae79eac2d 100755
--- a/src/conf_mode/ssh.py
+++ b/src/conf_mode/ssh.py
@@ -15,13 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/ssh/sshd_config'
@@ -120,15 +119,7 @@ def generate(ssh):
     if ssh is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'ssh')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    tmpl = env.get_template('sshd_config.tmpl')
-    config_text = tmpl.render(ssh)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'ssh/sshd_config.tmpl', ssh, trim_blocks=True)
     return None
 
 def apply(ssh):