From 15305aec40b933857ec26333c4cb437523860d3c Mon Sep 17 00:00:00 2001 From: Dobe Peter Date: Thu, 13 Aug 2015 13:47:55 +0200 Subject: [PATCH] Patch /etc/profile in Debian --- pillar/firewall.sls | 2 +- pillar/manager.sls | 2 +- salt/allinone.sls | 1 + salt/node.sls | 1 + salt/profile.sls | 10 ++++++++++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 salt/profile.sls diff --git a/pillar/firewall.sls b/pillar/firewall.sls index b0b9da8..65bf633 100644 --- a/pillar/firewall.sls +++ b/pillar/firewall.sls @@ -1,6 +1,6 @@ fwdriver: repo_name: https://git.ik.bme.hu/circle/fwdriver.git - repo_revision: systemd_feature + repo_revision: master user: fw diff --git a/pillar/manager.sls b/pillar/manager.sls index 2ff5eec..00f841f 100644 --- a/pillar/manager.sls +++ b/pillar/manager.sls @@ -1,4 +1,4 @@ manager: repo_name: https://git.ik.bme.hu/circle/cloud.git - repo_revision: synchronous_reload + repo_revision: master diff --git a/salt/allinone.sls b/salt/allinone.sls index 7751598..50afd85 100644 --- a/salt/allinone.sls +++ b/salt/allinone.sls @@ -1,4 +1,5 @@ include: + - profile - agentdriver - manager - graphite diff --git a/salt/node.sls b/salt/node.sls index 2566a8a..d1e8a54 100644 --- a/salt/node.sls +++ b/salt/node.sls @@ -1,4 +1,5 @@ include: + - profile - agentdriver - monitor-client - vmdriver diff --git a/salt/profile.sls b/salt/profile.sls new file mode 100644 index 0000000..b83f800 --- /dev/null +++ b/salt/profile.sls @@ -0,0 +1,10 @@ +{% if grains['os']=='Debian' %} +{# For non-interactive shells, virtualenvwrapper commands + ('workon' etc.) are not sourced automatically #} +/etc/profile: + file.append: + - text: + - "#Line below added for Debian by CIRCLE Salt installer" + - . /etc/bash_completion +{% endif %} + -- libgit2 0.26.0