Merge pull request #1 from salt-formulas/pr/env-variables
Sourcing env. specific varables
diff --git a/README.rst b/README.rst
index 257d21c..18d9ebd 100644
--- a/README.rst
+++ b/README.rst
@@ -72,11 +72,7 @@
.. code-block:: bash
- apt-get update
- apt-get install git curl subversion
-
- svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts \
- /srv/salt/scripts
+ git clone https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts
git clone <model-repository> /srv/salt/reclass
git submodule update --init --recursive
diff --git a/salt-master-init.sh b/salt-master-init.sh
index 380b1a7..343324c 100755
--- a/salt-master-init.sh
+++ b/salt-master-init.sh
@@ -107,7 +107,7 @@
pkill -9 salt-minion
SCRIPTS=$(dirname $0)
test -e ${SCRIPTS}/salt-master-setup.sh || \
- curl -sL "https://raw.githubusercontent.com/salt-formulas/salt-formulas/master/deploy/scripts/salt-master-setup.sh" |$SUDO tee ${SCRIPTS}/salt-master-setup.sh > /dev/null;
+ curl -sL "https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/salt-master-setup.sh" |$SUDO tee ${SCRIPTS}/salt-master-setup.sh > /dev/null;
$SUDO chmod +x *.sh;
test -e ${SCRIPTS}/.salt-master-setup.sh.passed || {
export SALT_MASTER=localhost
diff --git a/salt-master-setup.sh b/salt-master-setup.sh
index d231987..cba21fb 100755
--- a/salt-master-setup.sh
+++ b/salt-master-setup.sh
@@ -184,7 +184,7 @@
single_address: $SALT_MASTER
salt_master_host: $SALT_MASTER
salt_master_base_environment: $SALT_ENV
- linux_system_codename: $DISTRIB_CODENAME
+ linux_system_codename: $DISTRIB_CODENAME
linux:
system:
name: $MINION_ID