summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2018-07-02 12:12:12 +0200
committerKim Hagen <kim.sidney@gmail.com>2018-07-02 12:12:12 +0200
commitb5620c89d236365e53c0f78abfbe726cb03aaca4 (patch)
tree503eb31498d6a76d16759312bb93e83ba1581ca2
parent5470685b2874b4303300e316572f414d4fbaf196 (diff)
downloadvyos-salt-minion-b5620c89d236365e53c0f78abfbe726cb03aaca4.tar.gz
vyos-salt-minion-b5620c89d236365e53c0f78abfbe726cb03aaca4.zip
update dir for persistent config
-rw-r--r--debian/control2
-rwxr-xr-xsrc/conf_mode/salt-minion.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 54203cb..be45596 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Depends: python3,
python3-netifaces,
python3-jinja2,
python3-pystache,
+ salt-minion,
+ vyos-1x,
ipaddrcheck,
tcpdump,
bmon,
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index 4edb7a0..aa99ecc 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -82,7 +82,8 @@ def get_config():
return salt
def generate(salt):
- directory = '/config/salt/pki/minion'
+ directory = '/opt/vyatta/etc/config/salt/pki/minion'
+
if salt is None:
return None
@@ -108,7 +109,6 @@ def apply(salt):
if __name__ == '__main__':
try:
c = get_config()
- verify(c)
generate(c)
apply(c)
except ConfigError as e: