Merge pull request #203 from seanchannel/develop

add repos directly, start/stop
This commit is contained in:
Joseph Hall 2012-12-24 12:02:10 -08:00
commit 7ecd875b98
4 changed files with 50 additions and 7 deletions

View File

@ -0,0 +1,25 @@
#!/bin/bash
mkdir -p /etc/salt/pki
echo '{{ vm['priv_key'] }}' > /etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /etc/salt/pki/minion.pub
echo "{{ minion }}" > /etc/salt/minion
# echo deb http://ftp.debian.org/debian experimental main | tee -a /etc/apt/sources.list
echo deb http://backports.debian.org/debian-backports squeeze-backports main | tee -a /etc/apt/sources.list
echo deb http://debian.madduck.net/repo squeeze-backports main | tee -a /etc/apt/sources.list
wget -q -O- "http://debian.madduck.net/repo/gpg/archive.key" | apt-key add -
apt-get update
apt-get install -y salt-minion git-core
# minion will be started automatically by install
service salt-minion stop
rm -rf /usr/share/pyshared/salt*
rm -rf /usr/bin/salt-*
mkdir -p /root/git
cd /root/git
git clone git://github.com/saltstack/salt.git
cd salt
python setup.py install --install-layout=deb
service salt-minion start

View File

@ -0,0 +1,15 @@
#!/bin/bash
mkdir -p /etc/salt/pki
echo '{{ vm['priv_key'] }}' > /etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /etc/salt/pki/minion.pub
echo "{{ minion }}" > /etc/salt/minion
# echo deb http://ftp.debian.org/debian experimental main | tee -a /etc/apt/sources.list
echo deb http://backports.debian.org/debian-backports squeeze-backports main | tee -a /etc/apt/sources.list
echo deb http://debian.madduck.net/repo squeeze-backports main | tee -a /etc/apt/sources.list
wget -q -O- "http://debian.madduck.net/repo/gpg/archive.key" | apt-key add -
apt-get update
apt-get install -y salt-minion
# minion will be started automatically by install

View File

@ -5,11 +5,14 @@ echo '{{ vm['priv_key'] }}' > /etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /etc/salt/pki/minion.pub
echo "{{ minion }}" > /etc/salt/minion
echo deb http://ppa.launchpad.net/saltstack/salt/ubuntu `lsb_release -sc` main | tee /etc/apt/sources.list.d/saltstack.list
wget -q -O- "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4759FA960E27C0A6" | apt-key add -
apt-get update
apt-get install -y python-software-properties
echo | add-apt-repository ppa:saltstack/salt
apt-get update
apt-get install -y salt-minion git-core
# minion will be started automatically by install
service salt-minion stop
rm -rf /usr/share/pyshared/salt*
rm -rf /usr/bin/salt-*
mkdir -p /root/git

View File

@ -5,9 +5,9 @@ echo '{{ vm['priv_key'] }}' > /etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /etc/salt/pki/minion.pub
echo "{{ minion }}" > /etc/salt/minion
echo deb http://ppa.launchpad.net/saltstack/salt/ubuntu `lsb_release -sc` main | tee /etc/apt/sources.list.d/saltstack.list
wget -q -O- "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4759FA960E27C0A6" | apt-key add -
apt-get update
apt-get install -y python-software-properties
echo | add-apt-repository ppa:saltstack/salt
apt-get update
apt-get install -y salt-minion
service salt-minion start
# minion will be started automatically by install