From d4db508dda99e36f2e2da2435f6013568e52a0df Mon Sep 17 00:00:00 2001 From: Tomasz Rutkowski Date: Fri, 21 Dec 2012 13:10:43 +0100 Subject: [PATCH] - up to 0.11.1 - removed pld patch (installing lsb-release fixes it) - renamed to project name --- python-salt-grains.patch | 11 ----------- salt-master.service | 10 ++++++++++ salt-minion.service | 10 ++++++++++ python-salt.spec => salt.spec | 0 4 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 python-salt-grains.patch create mode 100644 salt-master.service create mode 100644 salt-minion.service rename python-salt.spec => salt.spec (100%) diff --git a/python-salt-grains.patch b/python-salt-grains.patch deleted file mode 100644 index 415f2f6..0000000 --- a/python-salt-grains.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- salt-0.9.6/salt/grains/core.py_orig 2012-02-15 10:14:02.313348662 +0000 -+++ salt-0.9.6/salt/grains/core.py 2012-02-15 10:15:23.770014906 +0000 -@@ -355,6 +355,8 @@ def os_data(): - grains['lsb_{0}'.format(match.groups()[0].lower())] = match.groups()[1].rstrip() - if os.path.isfile('/etc/arch-release'): - grains['os'] = 'Arch' -+ if os.path.isfile('/etc/pld-release'): -+ grains['os'] = 'PLD Linux' - elif os.path.isfile('/etc/debian_version'): - grains['os'] = 'Debian' - if 'lsb_distrib_id' in grains: diff --git a/salt-master.service b/salt-master.service new file mode 100644 index 0000000..148eeaf --- /dev/null +++ b/salt-master.service @@ -0,0 +1,10 @@ +[Unit] +Description=Salt Master daemon +After=syslog.target network.target + +[Service] +ExecStart=/usr/bin/salt-master -d +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/salt-minion.service b/salt-minion.service new file mode 100644 index 0000000..3abe473 --- /dev/null +++ b/salt-minion.service @@ -0,0 +1,10 @@ +[Unit] +Description=Salt Minion daemon +After=syslog.target network.target + +[Service] +ExecStart=/usr/bin/salt-minion -d +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/python-salt.spec b/salt.spec similarity index 100% rename from python-salt.spec rename to salt.spec -- 2.44.0