diff options
| author | junovitch <junovitch@FreeBSD.org> | 2015-08-24 07:46:46 +0800 |
|---|---|---|
| committer | junovitch <junovitch@FreeBSD.org> | 2015-08-24 07:46:46 +0800 |
| commit | 8e3f41b8ee91fe972e9936d85f44fc574609ef06 (patch) | |
| tree | f33a1ee7a1bd3dc15d48d6901cb0af94fe25432c /sysutils | |
| parent | 9c781addb59b080d0dffec4f8c4f975bc5261b21 (diff) | |
| download | freebsd-ports-gnome-8e3f41b8ee91fe972e9936d85f44fc574609ef06.tar.gz freebsd-ports-gnome-8e3f41b8ee91fe972e9936d85f44fc574609ef06.tar.zst freebsd-ports-gnome-8e3f41b8ee91fe972e9936d85f44fc574609ef06.zip | |
sysutils/py-salt: update 2015.5.3 -> 2015.5.4 [1], add salt_api rc script [2]
PR: 202417 [1]
PR: 202042 [2]
Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer) [1]
Submitted by: xenophon+fbsdports@irtnog.org [2]
Approved by: maintainer [2], feld (mentor)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/py-salt/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/py-salt/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/py-salt/files/salt_api.in | 30 | ||||
| -rw-r--r-- | sysutils/py-salt/pkg-plist | 6 |
4 files changed, 41 insertions, 4 deletions
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 0e8ce94f5db5..6cb2d6979b0c 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2015.5.3 +PORTVERSION= 2015.5.4 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -55,7 +55,8 @@ PYDISTUTILS_INSTALLARGS+=\ --salt-logs-dir=/var/log/salt \ --salt-pidfile-dir=/var/run -USE_RC_SUBR= salt_master \ +USE_RC_SUBR= salt_api \ + salt_master \ salt_minion \ salt_syndic diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index 54d24fb44346..34b80d7c79b1 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,2 +1,2 @@ -SHA256 (salt-2015.5.3.tar.gz) = f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853 -SIZE (salt-2015.5.3.tar.gz) = 5389038 +SHA256 (salt-2015.5.4.tar.gz) = 4bd890f6da8f6bfb6913aa59932cfa1a1beb1b04f7abc148a4f272493135b85f +SIZE (salt-2015.5.4.tar.gz) = 5520712 diff --git a/sysutils/py-salt/files/salt_api.in b/sysutils/py-salt/files/salt_api.in new file mode 100644 index 000000000000..79e04b34f42f --- /dev/null +++ b/sysutils/py-salt/files/salt_api.in @@ -0,0 +1,30 @@ +#!/bin/sh + +# $FreeBSD$ +# +# Salt API startup script +# +# PROVIDE: salt_api +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# Add the following to /etc/rc.conf[.local] to enable this service +# +# salt_api_enable="YES" +# + +. /etc/rc.subr + +name="salt_api" +rcvar=salt_api_enable + +load_rc_config ${name} + +: ${salt_api_enable:="NO"} + +command="%%PREFIX%%/bin/salt-api" +command_interpreter="%%PYTHON_CMD%%" +required_files="%%PREFIX%%/etc/salt" +command_args="-c ${required_files} -d" + +run_rc_command "$1" diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist index 9628e894788f..bdbd6401d83d 100644 --- a/sysutils/py-salt/pkg-plist +++ b/sysutils/py-salt/pkg-plist @@ -162,6 +162,8 @@ %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.pyc %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.py %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.pyc +%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vmware.py +%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vmware.pyc %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.py %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.pyc %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch-git.sh @@ -783,6 +785,8 @@ %%PYTHON_SITELIBDIR%%/salt/modules/system.pyc %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.py +%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.pyc %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc %%PYTHON_SITELIBDIR%%/salt/modules/test.py @@ -1651,6 +1655,8 @@ %%PYTHON_SITELIBDIR%%/salt/utils/thin.pyc %%PYTHON_SITELIBDIR%%/salt/utils/timed_subprocess.py %%PYTHON_SITELIBDIR%%/salt/utils/timed_subprocess.pyc +%%PYTHON_SITELIBDIR%%/salt/utils/url.py +%%PYTHON_SITELIBDIR%%/salt/utils/url.pyc %%PYTHON_SITELIBDIR%%/salt/utils/validate/__init__.py %%PYTHON_SITELIBDIR%%/salt/utils/validate/__init__.pyc %%PYTHON_SITELIBDIR%%/salt/utils/validate/net.py |