diff options
| author | he <he@pkgsrc.org> | 2016-02-18 09:24:25 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2016-02-18 09:24:25 +0000 |
| commit | e3993f2070051f4efda380534e6d078f1764e4a8 (patch) | |
| tree | 9f9ca6ccff3485ea709cf1822f01d614712293ce /sysutils/ansible | |
| parent | 97202a32e9e9368a29236f9cc965e5aa20c02fde (diff) | |
| download | pkgsrc-e3993f2070051f4efda380534e6d078f1764e4a8.tar.gz | |
Move the ansible/roles file tree out from under etc/ to share/,
so that any packages which want to install files there don't have
to battle with pkgsrc's requirement to use CONF_FILES.
Bump PKGREVISION.
Diffstat (limited to 'sysutils/ansible')
| -rw-r--r-- | sysutils/ansible/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/ansible/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/ansible/patches/patch-lib_ansible_constants | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 93135aa675f..e0fe81cc905 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2016/02/17 20:31:45 he Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/18 09:24:25 he Exp $ DISTNAME= ansible-1.9.4 -PKGREVISION= 1 +PKGREVISION= 2 #PKGNAME= ${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready CATEGORIES= python sysutils MASTER_SITES= http://releases.ansible.com/ansible/ @@ -56,6 +56,7 @@ MANPAGES+= ansible-playbook.1 ansible.1 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKG_SYSCONFDIR}/ansible INSTALLATION_DIRS+= ${EGDIR}/playbooks +INSTALLATION_DIRS+= share/ansible/roles CHECK_INTERPRETER_SKIP= share/ansible/* diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo index c0cea626980..1691caff816 100644 --- a/sysutils/ansible/distinfo +++ b/sysutils/ansible/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2016/02/17 20:31:45 he Exp $ +$NetBSD: distinfo,v 1.11 2016/02/18 09:24:25 he Exp $ SHA1 (ansible-1.9.4.tar.gz) = f71f451d96239d08396d20fff2d9b8840426f714 RMD160 (ansible-1.9.4.tar.gz) = a88a7a1a19a82e6ca17ca77ae8d64a428cf37fe8 @@ -12,7 +12,7 @@ SHA1 (patch-docs_man_man1_ansible-playbook-asciidoc) = ac1d24661de7d6292252ce696 SHA1 (patch-examples_ansible) = f29fedf979a7ef0255d88d6e593eb84ca92fa3de SHA1 (patch-examples_hosts) = ed21ed3f6f3db7d4ec9cd273e15adf075cec953d SHA1 (patch-lib_ansible_callbacks) = bdcec47047b5361012472f6276df21618cc664bb -SHA1 (patch-lib_ansible_constants) = 0e95e2b3bd2b1b2b9deb95c64d6131d850260b39 +SHA1 (patch-lib_ansible_constants) = 59b0cb0e666280ebc453399d20d10ba4ad621066 SHA1 (patch-lib_ansible_modules_core_system_ping) = 1b91dbdb74e8cfc5e0bf99628e5ebb4bbd54dead SHA1 (patch-lib_ansible_modules_core_system_setup) = a9a92a4a8786e0f96155cbd6d4d7b459d7728f0c SHA1 (patch-lib_ansible_modules_extras_database_misc_riak) = 26fcb21fe56613a151913398c677d2fdcdaa3703 diff --git a/sysutils/ansible/patches/patch-lib_ansible_constants b/sysutils/ansible/patches/patch-lib_ansible_constants index c0e08a2a6be..40a7c874e85 100644 --- a/sysutils/ansible/patches/patch-lib_ansible_constants +++ b/sysutils/ansible/patches/patch-lib_ansible_constants @@ -1,6 +1,7 @@ -$NetBSD: patch-lib_ansible_constants,v 1.1 2016/02/17 20:31:45 he Exp $ +$NetBSD: patch-lib_ansible_constants,v 1.2 2016/02/18 09:24:25 he Exp $ Fix hardcoded paths to be replaced with SUBST framework. +Move the ansible/roles tree out from under any etc/ directory to share/ --- lib/ansible/constants.py.orig 2015-06-25 20:39:08.000000000 +0000 +++ lib/ansible/constants.py @@ -21,7 +22,7 @@ Fix hardcoded paths to be replaced with SUBST framework. +DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_INVENTORY', get_config(p, DEFAULTS,'hostfile','ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts'))) DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None) -DEFAULT_ROLES_PATH = shell_expand_path(get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/etc/ansible/roles')) -+DEFAULT_ROLES_PATH = shell_expand_path(get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '@PKG_SYSCONFDIR@/ansible/roles')) ++DEFAULT_ROLES_PATH = shell_expand_path(get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '@PREFIX@/share/ansible/roles')) DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp') DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command') DEFAULT_PATTERN = get_config(p, DEFAULTS, 'pattern', None, '*') |