diff options
Diffstat (limited to 'app-admin/salt/files')
21 files changed, 436 insertions, 0 deletions
diff --git a/app-admin/salt/files/api-confd-1 b/app-admin/salt/files/api-confd-1 new file mode 100644 index 000000000000..c70e8e766da0 --- /dev/null +++ b/app-admin/salt/files/api-confd-1 @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master + +# see man pages for salt-minion or run `salt-master --help` +# for valid cmdline options +SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/api-initd-3 b/app-admin/salt/files/api-initd-3 new file mode 100644 index 000000000000..e5be2c3d83d8 --- /dev/null +++ b/app-admin/salt/files/api-initd-3 @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-api" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-api.pid" +name="SALT API daemon" + +depend() { + use net logger +} diff --git a/app-admin/salt/files/api-initd-4 b/app-admin/salt/files/api-initd-4 new file mode 100644 index 000000000000..e69acdf86b9b --- /dev/null +++ b/app-admin/salt/files/api-initd-4 @@ -0,0 +1,15 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-api" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-api.pid" +name="SALT API daemon" +retry="20" + +depend() { + use net logger +} diff --git a/app-admin/salt/files/master-confd-1 b/app-admin/salt/files/master-confd-1 new file mode 100644 index 000000000000..c70e8e766da0 --- /dev/null +++ b/app-admin/salt/files/master-confd-1 @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master + +# see man pages for salt-minion or run `salt-master --help` +# for valid cmdline options +SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/master-initd-3 b/app-admin/salt/files/master-initd-3 new file mode 100644 index 000000000000..ecaa29f5779b --- /dev/null +++ b/app-admin/salt/files/master-initd-3 @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-master" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-master.pid" +name="SALT master daemon" + +depend() { + use net logger +} diff --git a/app-admin/salt/files/master-initd-4 b/app-admin/salt/files/master-initd-4 new file mode 100644 index 000000000000..dc4962809e02 --- /dev/null +++ b/app-admin/salt/files/master-initd-4 @@ -0,0 +1,15 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-master" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-master.pid" +name="SALT master daemon" +retry="20" + +depend() { + use net logger +} diff --git a/app-admin/salt/files/minion-confd-1 b/app-admin/salt/files/minion-confd-1 new file mode 100644 index 000000000000..d69d83fcd60d --- /dev/null +++ b/app-admin/salt/files/minion-confd-1 @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion + +# see man pages for salt-minion or run `salt-minion --help` +# for valid cmdline options +SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/minion-initd-3 b/app-admin/salt/files/minion-initd-3 new file mode 100644 index 000000000000..07842841a59a --- /dev/null +++ b/app-admin/salt/files/minion-initd-3 @@ -0,0 +1,15 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-minion" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-minion.pid" +name="SALT minion daemon" + +depend() { + need net + use logger +} diff --git a/app-admin/salt/files/minion-initd-4 b/app-admin/salt/files/minion-initd-4 new file mode 100644 index 000000000000..350703a0b52b --- /dev/null +++ b/app-admin/salt/files/minion-initd-4 @@ -0,0 +1,16 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-minion" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-minion.pid" +name="SALT minion daemon" +retry="20" + +depend() { + need net + use logger +} diff --git a/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch new file mode 100644 index 000000000000..0cf3efe8f347 --- /dev/null +++ b/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch @@ -0,0 +1,104 @@ +diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py +index 59442bd..2c5d129 100644 +--- a/tests/unit/pydsl_test.py ++++ b/tests/unit/pydsl_test.py +@@ -297,99 +297,6 @@ class PyDSLRendererTestCase(TestCase): + finally: + shutil.rmtree(dirpath, ignore_errors=True) + +- def test_rendering_includes(self): +- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) +- if not os.path.isdir(dirpath): +- self.skipTest( +- 'The temporary directory {0!r} was not created'.format( +- dirpath +- ) +- ) +- output = os.path.join(dirpath, 'output') +- try: +- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\ +- #!pydsl|stateconf -ps +- +- include('xxx') +- yyy = include('yyy') +- +- # ensure states in xxx are run first, then those in yyy and then those in aaa last. +- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal')) +- extend(state('.start').stateconf.require(stateconf='yyy::goal')) +- +- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}')) +- +- __pydsl__.set(ordered=True) +- +- yyy.hello('red', 1) +- yyy.hello('green', 2) +- yyy.hello('blue', 3) +- '''.format(output))) +- +- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\ +- #!stateconf -os yaml . jinja +- +- include: +- - yyy +- +- extend: +- yyy::start: +- stateconf.set: +- - require: +- - stateconf: .goal +- +- yyy::Y1: +- cmd.run: +- - name: 'echo Y1 extended >> {0}' +- +- .X1: +- cmd.run: +- - name: echo X1 >> {1} +- - cwd: / +- .X2: +- cmd.run: +- - name: echo X2 >> {2} +- - cwd: / +- .X3: +- cmd.run: +- - name: echo X3 >> {3} +- - cwd: / +- +- '''.format(output, output, output, output))) +- +- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\ +- #!pydsl|stateconf -ps +- +- include('xxx') +- __pydsl__.set(ordered=True) +- +- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/') +- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/') +- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/') +- +- def hello(color, number): +- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/') +- '''.format(output, output, output, output))) +- +- state_highstate({'base': ['aaa']}, dirpath) +- expected = textwrap.dedent('''\ +- X1 +- X2 +- X3 +- Y1 extended +- Y2 extended +- Y3 +- hello red 1 +- hello green 2 +- hello blue 3 +- ''') +- +- with open(output, 'r') as f: +- self.assertEqual(sorted(f.read()), sorted(expected)) +- +- finally: +- shutil.rmtree(dirpath, ignore_errors=True) +- + def test_compile_time_state_execution(self): + if not sys.stdin.isatty(): + self.skipTest('Not attached to a TTY') diff --git a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch new file mode 100644 index 000000000000..7c33c12f5c71 --- /dev/null +++ b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch @@ -0,0 +1,104 @@ +diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py +index 57ba81e..b26154e 100644 +--- a/tests/unit/pydsl_test.py ++++ b/tests/unit/pydsl_test.py +@@ -298,99 +298,6 @@ class PyDSLRendererTestCase(TestCase): + finally: + shutil.rmtree(dirpath, ignore_errors=True) + +- def test_rendering_includes(self): +- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) +- if not os.path.isdir(dirpath): +- self.skipTest( +- 'The temporary directory {0!r} was not created'.format( +- dirpath +- ) +- ) +- output = os.path.join(dirpath, 'output') +- try: +- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\ +- #!pydsl|stateconf -ps +- +- include('xxx') +- yyy = include('yyy') +- +- # ensure states in xxx are run first, then those in yyy and then those in aaa last. +- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal')) +- extend(state('.start').stateconf.require(stateconf='yyy::goal')) +- +- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}')) +- +- __pydsl__.set(ordered=True) +- +- yyy.hello('red', 1) +- yyy.hello('green', 2) +- yyy.hello('blue', 3) +- '''.format(output))) +- +- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\ +- #!stateconf -os yaml . jinja +- +- include: +- - yyy +- +- extend: +- yyy::start: +- stateconf.set: +- - require: +- - stateconf: .goal +- +- yyy::Y1: +- cmd.run: +- - name: 'echo Y1 extended >> {0}' +- +- .X1: +- cmd.run: +- - name: echo X1 >> {1} +- - cwd: / +- .X2: +- cmd.run: +- - name: echo X2 >> {2} +- - cwd: / +- .X3: +- cmd.run: +- - name: echo X3 >> {3} +- - cwd: / +- +- '''.format(output, output, output, output))) +- +- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\ +- #!pydsl|stateconf -ps +- +- include('xxx') +- __pydsl__.set(ordered=True) +- +- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/') +- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/') +- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/') +- +- def hello(color, number): +- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/') +- '''.format(output, output, output, output))) +- +- state_highstate({'base': ['aaa']}, dirpath) +- expected = textwrap.dedent('''\ +- X1 +- X2 +- X3 +- Y1 extended +- Y2 extended +- Y3 +- hello red 1 +- hello green 2 +- hello blue 3 +- ''') +- +- with salt.utils.fopen(output, 'r') as f: +- self.assertEqual(sorted(f.read()), sorted(expected)) +- +- finally: +- shutil.rmtree(dirpath, ignore_errors=True) +- + def test_compile_time_state_execution(self): + if not sys.stdin.isatty(): + self.skipTest('Not attached to a TTY') diff --git a/app-admin/salt/files/salt-2014.7.5-archive-test.patch b/app-admin/salt/files/salt-2014.7.5-archive-test.patch new file mode 100644 index 000000000000..f7ff561efd62 --- /dev/null +++ b/app-admin/salt/files/salt-2014.7.5-archive-test.patch @@ -0,0 +1,15 @@ +diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py +index a7f3005..bb0bc45 100644 +--- a/tests/unit/states/archive_test.py ++++ b/tests/unit/states/archive_test.py +@@ -78,9 +78,7 @@ class ArchiveTest(TestCase): + running_as = 'root' + filename = os.path.join( + tmp_dir, +- 'files/test/_tmp{0}_test_archive.tar'.format( +- '' if running_as == 'root' else '_{0}'.format(running_as) +- ) ++ 'files/test/_tmp_test_archive.tar' + ) + for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): + ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/files/salt-2015.5.0-archive-test.patch b/app-admin/salt/files/salt-2015.5.0-archive-test.patch new file mode 100644 index 000000000000..c47422326974 --- /dev/null +++ b/app-admin/salt/files/salt-2015.5.0-archive-test.patch @@ -0,0 +1,15 @@ +diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py +index 588ec1a..acd53fa 100644 +--- a/tests/unit/states/archive_test.py ++++ b/tests/unit/states/archive_test.py +@@ -78,9 +78,7 @@ class ArchiveTest(TestCase): + running_as = 'root' + filename = os.path.join( + tmp_dir, +- 'files/test/_tmp{0}_test_archive_.tar'.format( +- '' if running_as == 'root' else '_{0}'.format(running_as) +- ) ++ 'files/test/_tmp_test_archive_.tar' + ) + for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): + ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch b/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch new file mode 100644 index 000000000000..acb8a091ac48 --- /dev/null +++ b/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch @@ -0,0 +1,20 @@ +diff --git a/tests/unit/states/libvirt_test.py b/tests/unit/states/libvirt_test.py +index ec09542..477e5c3 100644 +--- a/tests/unit/states/libvirt_test.py ++++ b/tests/unit/states/libvirt_test.py +@@ -4,6 +4,7 @@ + ''' + # Import Python libs + from __future__ import absolute_import ++import os + + # Import Salt Testing Libs + from salttesting import skipIf, TestCase +@@ -27,6 +28,7 @@ libvirt.__opts__ = {} + + + @skipIf(NO_MOCK, NO_MOCK_REASON) ++@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test') + class LibvirtTestCase(TestCase): + ''' + Test cases for salt.states.libvirt diff --git a/app-admin/salt/files/salt-api.service b/app-admin/salt/files/salt-api.service new file mode 100644 index 000000000000..fd9f665fff09 --- /dev/null +++ b/app-admin/salt/files/salt-api.service @@ -0,0 +1,10 @@ +[Unit] +Description=The Salt Master Server +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/bin/salt-api + +[Install] +WantedBy=multi-user.target diff --git a/app-admin/salt/files/salt-master.service b/app-admin/salt/files/salt-master.service new file mode 100644 index 000000000000..4f3827ede6df --- /dev/null +++ b/app-admin/salt/files/salt-master.service @@ -0,0 +1,10 @@ +[Unit] +Description=The Salt Master Server +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/bin/salt-master + +[Install] +WantedBy=multi-user.target diff --git a/app-admin/salt/files/salt-minion.service b/app-admin/salt/files/salt-minion.service new file mode 100644 index 000000000000..2f199f998eca --- /dev/null +++ b/app-admin/salt/files/salt-minion.service @@ -0,0 +1,10 @@ +[Unit] +Description=The Salt Minion +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/bin/salt-minion + +[Install] +WantedBy=multi-user.target diff --git a/app-admin/salt/files/salt-syndic.service b/app-admin/salt/files/salt-syndic.service new file mode 100644 index 000000000000..922eef35af8b --- /dev/null +++ b/app-admin/salt/files/salt-syndic.service @@ -0,0 +1,10 @@ +[Unit] +Description=The Salt Master Server +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/bin/salt-syndic + +[Install] +WantedBy=multi-user.target diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1 new file mode 100644 index 000000000000..d69d83fcd60d --- /dev/null +++ b/app-admin/salt/files/syndic-confd-1 @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion + +# see man pages for salt-minion or run `salt-minion --help` +# for valid cmdline options +SALT_OPTS="--log-level=warning" diff --git a/app-admin/salt/files/syndic-initd-3 b/app-admin/salt/files/syndic-initd-3 new file mode 100644 index 000000000000..532be92c50f8 --- /dev/null +++ b/app-admin/salt/files/syndic-initd-3 @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-syndic" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-syndic.pid" +name="SALT syndic daemon" + +depend() { + use net logger +} diff --git a/app-admin/salt/files/syndic-initd-4 b/app-admin/salt/files/syndic-initd-4 new file mode 100644 index 000000000000..65916b4b42c2 --- /dev/null +++ b/app-admin/salt/files/syndic-initd-4 @@ -0,0 +1,15 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/salt-syndic" +command_args="${SALT_OPTS}" +command_background="1" +pidfile="/var/run/salt-syndic.pid" +name="SALT syndic daemon" +retry="20" + +depend() { + use net logger +} |