remove app-admin/salt from overlay
This commit is contained in:
@@ -1,5 +0,0 @@
|
||||
# /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"
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
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
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
# /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"
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
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
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
# /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"
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
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
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/tests/support/paths.py b/tests/support/paths.py
|
||||
index da93c8e1e3..895c636fef 100644
|
||||
--- a/tests/support/paths.py
|
||||
+++ b/tests/support/paths.py
|
||||
@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path:
|
||||
if TESTS_DIR not in sys.path:
|
||||
sys.path.insert(1, TESTS_DIR)
|
||||
|
||||
-SYS_TMP_DIR = os.path.abspath(os.path.realpath(
|
||||
+SYS_TMP_DIR = os.path.abspath(
|
||||
# Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
|
||||
# for unix sockets: ``error: AF_UNIX path too long``
|
||||
# Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
|
||||
os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp'
|
||||
-))
|
||||
+)
|
||||
TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
|
||||
FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
|
||||
PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
|
||||
@@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=The Salt Master Server
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/salt-api
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=The Salt Master Server
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/salt-master
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=The Salt Minion
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/salt-minion
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=The Salt Master Server
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/salt-syndic
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,5 +0,0 @@
|
||||
# /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"
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user