From 560e82903b90a45d86b1c22b55e90cf840099c50 Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Thu, 1 Feb 2024 23:58:36 +0100 Subject: [PATCH] fix states --- map.jinja | 4 +++- nginx/init.sls | 2 +- top.sls | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/map.jinja b/map.jinja index bf24487..7b6af05 100644 --- a/map.jinja +++ b/map.jinja @@ -1,5 +1,7 @@ +{% set dir = '/usr/local/noveria' %} + {% set noveria = { - 'dir': '/usr/local/noveria', + 'dir': '%s' % dir, 'bin_dir': '%s/bin' % dir, 'etc_dir': '%s/etc' % dir, 'app_dir': '%s/apps' % dir diff --git a/nginx/init.sls b/nginx/init.sls index 5ab2baa..e644f3d 100644 --- a/nginx/init.sls +++ b/nginx/init.sls @@ -1,4 +1,4 @@ -{% from "{{ tpldir }}/map.jinja" import nginx with context %} +{% from tpldir+"/map.jinja" import nginx with context %} nginx_pkg: pkg.installed: diff --git a/top.sls b/top.sls index e4c69e6..de83a2b 100644 --- a/top.sls +++ b/top.sls @@ -1,7 +1,6 @@ base: '*': - directories - - pillars - system - network - apps