diff options
| author | hubertf <hubertf@pkgsrc.org> | 2013-12-02 22:54:46 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2013-12-02 22:54:46 +0000 |
| commit | 7ed646d212ef46a2f4c77009385767206a01844d (patch) | |
| tree | 8baf4a1e5089b9b6f226d59299e2486389dc44d8 | |
| parent | 9243a3c58c32318fb933b03bb95a732f00c408bc (diff) | |
| download | pkgsrc-7ed646d212ef46a2f4c77009385767206a01844d.tar.gz | |
Update ansible to 1.4.1.
Some changes:
* Many new modules, sorted in the following subdirs:
cloud commands database files internal inventory messaging
monitoring net_infrastructure network notification packaging
source_control system utilities web_infrastructure
* accelerated mode: An enhanced fireball mode that requires zero
bootstrapping and fewer requirements plus adds capabilities like
sudo commands
* Connection default is now "smart", which discovers if the system
openssh can support ControlPersist, and uses it if so, if not
falls back to paramiko
* external inventory scripts may now return host variables in one
pass, which allows them to be much more efficient for large numbers
of hosts (AWS!)
* "~" now expanded on each component of configured plugin paths
* Countless feature enhancements and bugfixes
For a full list, see https://github.com/ansible/ansible/blob/devel/CHANGELOG.md
20 files changed, 492 insertions, 428 deletions
diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 6943e1be0cd..61b0ef9a904 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.4326 2013/12/02 20:08:53 adam Exp $ +$NetBSD: CHANGES-2013,v 1.4327 2013/12/02 22:55:17 hubertf Exp $ Changes to the packages collection and infrastructure in 2013: @@ -6285,3 +6285,4 @@ Changes to the packages collection and infrastructure in 2013: Updated print/tex-collection-genericrecommended-doc to 2013 [minskim 2013-12-02] Updated finance/tex-euro-doc to 1.1pl22191 [minskim 2013-12-02] Updated archivers/lhasa to 0.2.0 [adam 2013-12-02] + Updated sysutils/ansible to 1.4.1 [hubertf 2013-12-02] diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index a9877ebb849..ba9b19901ab 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2013/04/13 17:51:57 riz Exp $ +# $NetBSD: Makefile,v 1.8 2013/12/02 22:54:46 hubertf Exp $ # -DISTNAME= ansible-1.1 +DISTNAME= ansible-1.4.1 CATEGORIES= sysutils -MASTER_SITES= http://ansible.cc/releases/ +MASTER_SITES= http://ansibleworks.com/releases/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://ansible.cc/ +HOMEPAGE= http://ansibleworks.com/ COMMENT= SSH-based configuration management, deployment, and task execution LICENSE= gnu-gpl-v3 @@ -17,8 +17,6 @@ USE_TOOLS+= gmake SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure -SUBST_FILES.prefix= docs/man/man1/ansible-playbook.1 -SUBST_FILES.prefix+= docs/man/man1/ansible.1 SUBST_FILES.prefix+= examples/ansible.cfg SUBST_FILES.prefix+= lib/ansible/constants.py SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX}," @@ -28,13 +26,8 @@ SUBST_CLASSES+= localbase SUBST_STAGE.localbase= pre-configure SUBST_FILES.localbase= \ lib/ansible/callbacks.py \ - library/mysql_db \ - library/ping \ - library/pkgin \ - library/raw \ - library/setup \ - library/slurp \ - library/virt + library/packaging/pkgin \ + library/system/setup SUBST_SED.localbase= -e "s,@LOCALBASE@,${LOCALBASE}," SUBST_CLASSES+= pythonbin @@ -67,16 +60,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/${f} \ ${DESTDIR}/${EGDIR} .endfor - ${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks - for f in ${WRKSRC}/examples/playbooks/*.yml; do \ - ${INSTALL_DATA} $$f ${DESTDIR}/${EGDIR}/playbooks; \ - done -.for f in filter_plugins handlers tasks templates vars - ${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks/${f} - for g in ${WRKSRC}/examples/playbooks/${f}/*; do \ - ${INSTALL_DATA} $$g ${DESTDIR}/${EGDIR}/playbooks/${f}; \ - done -.endfor .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/sysutils/ansible/PLIST b/sysutils/ansible/PLIST index efa4e8a4042..6c69028c660 100644 --- a/sysutils/ansible/PLIST +++ b/sysutils/ansible/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/04/13 17:51:57 riz Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/12/02 22:54:46 hubertf Exp $ bin/ansible bin/ansible-doc bin/ansible-playbook @@ -55,6 +55,15 @@ ${PYSITELIB}/ansible/inventory/vars_plugins/group_vars.pyo ${PYSITELIB}/ansible/module_common.py ${PYSITELIB}/ansible/module_common.pyc ${PYSITELIB}/ansible/module_common.pyo +${PYSITELIB}/ansible/module_utils/__init__.py +${PYSITELIB}/ansible/module_utils/__init__.pyc +${PYSITELIB}/ansible/module_utils/__init__.pyo +${PYSITELIB}/ansible/module_utils/basic.py +${PYSITELIB}/ansible/module_utils/basic.pyc +${PYSITELIB}/ansible/module_utils/basic.pyo +${PYSITELIB}/ansible/module_utils/ec2.py +${PYSITELIB}/ansible/module_utils/ec2.pyc +${PYSITELIB}/ansible/module_utils/ec2.pyo ${PYSITELIB}/ansible/playbook/__init__.py ${PYSITELIB}/ansible/playbook/__init__.pyc ${PYSITELIB}/ansible/playbook/__init__.pyo @@ -73,6 +82,9 @@ ${PYSITELIB}/ansible/runner/action_plugins/__init__.pyo ${PYSITELIB}/ansible/runner/action_plugins/add_host.py ${PYSITELIB}/ansible/runner/action_plugins/add_host.pyc ${PYSITELIB}/ansible/runner/action_plugins/add_host.pyo +${PYSITELIB}/ansible/runner/action_plugins/assemble.py +${PYSITELIB}/ansible/runner/action_plugins/assemble.pyc +${PYSITELIB}/ansible/runner/action_plugins/assemble.pyo ${PYSITELIB}/ansible/runner/action_plugins/async.py ${PYSITELIB}/ansible/runner/action_plugins/async.pyc ${PYSITELIB}/ansible/runner/action_plugins/async.pyo @@ -91,6 +103,9 @@ ${PYSITELIB}/ansible/runner/action_plugins/fetch.pyo ${PYSITELIB}/ansible/runner/action_plugins/group_by.py ${PYSITELIB}/ansible/runner/action_plugins/group_by.pyc ${PYSITELIB}/ansible/runner/action_plugins/group_by.pyo +${PYSITELIB}/ansible/runner/action_plugins/include_vars.py +${PYSITELIB}/ansible/runner/action_plugins/include_vars.pyc +${PYSITELIB}/ansible/runner/action_plugins/include_vars.pyo ${PYSITELIB}/ansible/runner/action_plugins/normal.py ${PYSITELIB}/ansible/runner/action_plugins/normal.pyc ${PYSITELIB}/ansible/runner/action_plugins/normal.pyo @@ -103,21 +118,39 @@ ${PYSITELIB}/ansible/runner/action_plugins/raw.pyo ${PYSITELIB}/ansible/runner/action_plugins/script.py ${PYSITELIB}/ansible/runner/action_plugins/script.pyc ${PYSITELIB}/ansible/runner/action_plugins/script.pyo +${PYSITELIB}/ansible/runner/action_plugins/set_fact.py +${PYSITELIB}/ansible/runner/action_plugins/set_fact.pyc +${PYSITELIB}/ansible/runner/action_plugins/set_fact.pyo +${PYSITELIB}/ansible/runner/action_plugins/synchronize.py +${PYSITELIB}/ansible/runner/action_plugins/synchronize.pyc +${PYSITELIB}/ansible/runner/action_plugins/synchronize.pyo ${PYSITELIB}/ansible/runner/action_plugins/template.py ${PYSITELIB}/ansible/runner/action_plugins/template.pyc ${PYSITELIB}/ansible/runner/action_plugins/template.pyo +${PYSITELIB}/ansible/runner/action_plugins/unarchive.py +${PYSITELIB}/ansible/runner/action_plugins/unarchive.pyc +${PYSITELIB}/ansible/runner/action_plugins/unarchive.pyo ${PYSITELIB}/ansible/runner/connection.py ${PYSITELIB}/ansible/runner/connection.pyc ${PYSITELIB}/ansible/runner/connection.pyo ${PYSITELIB}/ansible/runner/connection_plugins/__init__.py ${PYSITELIB}/ansible/runner/connection_plugins/__init__.pyc ${PYSITELIB}/ansible/runner/connection_plugins/__init__.pyo +${PYSITELIB}/ansible/runner/connection_plugins/accelerate.py +${PYSITELIB}/ansible/runner/connection_plugins/accelerate.pyc +${PYSITELIB}/ansible/runner/connection_plugins/accelerate.pyo ${PYSITELIB}/ansible/runner/connection_plugins/chroot.py ${PYSITELIB}/ansible/runner/connection_plugins/chroot.pyc ${PYSITELIB}/ansible/runner/connection_plugins/chroot.pyo ${PYSITELIB}/ansible/runner/connection_plugins/fireball.py ${PYSITELIB}/ansible/runner/connection_plugins/fireball.pyc ${PYSITELIB}/ansible/runner/connection_plugins/fireball.pyo +${PYSITELIB}/ansible/runner/connection_plugins/funcd.py +${PYSITELIB}/ansible/runner/connection_plugins/funcd.pyc +${PYSITELIB}/ansible/runner/connection_plugins/funcd.pyo +${PYSITELIB}/ansible/runner/connection_plugins/jail.py +${PYSITELIB}/ansible/runner/connection_plugins/jail.pyc +${PYSITELIB}/ansible/runner/connection_plugins/jail.pyo ${PYSITELIB}/ansible/runner/connection_plugins/local.py ${PYSITELIB}/ansible/runner/connection_plugins/local.pyc ${PYSITELIB}/ansible/runner/connection_plugins/local.pyo @@ -142,6 +175,9 @@ ${PYSITELIB}/ansible/runner/lookup_plugins/dnstxt.pyo ${PYSITELIB}/ansible/runner/lookup_plugins/env.py ${PYSITELIB}/ansible/runner/lookup_plugins/env.pyc ${PYSITELIB}/ansible/runner/lookup_plugins/env.pyo +${PYSITELIB}/ansible/runner/lookup_plugins/etcd.py +${PYSITELIB}/ansible/runner/lookup_plugins/etcd.pyc +${PYSITELIB}/ansible/runner/lookup_plugins/etcd.pyo ${PYSITELIB}/ansible/runner/lookup_plugins/file.py ${PYSITELIB}/ansible/runner/lookup_plugins/file.pyc ${PYSITELIB}/ansible/runner/lookup_plugins/file.pyo @@ -151,6 +187,15 @@ ${PYSITELIB}/ansible/runner/lookup_plugins/fileglob.pyo ${PYSITELIB}/ansible/runner/lookup_plugins/first_found.py ${PYSITELIB}/ansible/runner/lookup_plugins/first_found.pyc ${PYSITELIB}/ansible/runner/lookup_plugins/first_found.pyo +${PYSITELIB}/ansible/runner/lookup_plugins/flattened.py +${PYSITELIB}/ansible/runner/lookup_plugins/flattened.pyc +${PYSITELIB}/ansible/runner/lookup_plugins/flattened.pyo +${PYSITELIB}/ansible/runner/lookup_plugins/indexed_items.py +${PYSITELIB}/ansible/runner/lookup_plugins/indexed_items.pyc +${PYSITELIB}/ansible/runner/lookup_plugins/indexed_items.pyo +${PYSITELIB}/ansible/runner/lookup_plugins/inventory_hostnames.py +${PYSITELIB}/ansible/runner/lookup_plugins/inventory_hostnames.pyc +${PYSITELIB}/ansible/runner/lookup_plugins/inventory_hostnames.pyo ${PYSITELIB}/ansible/runner/lookup_plugins/items.py ${PYSITELIB}/ansible/runner/lookup_plugins/items.pyc ${PYSITELIB}/ansible/runner/lookup_plugins/items.pyo @@ -175,9 +220,15 @@ ${PYSITELIB}/ansible/runner/lookup_plugins/redis_kv.pyo ${PYSITELIB}/ansible/runner/lookup_plugins/sequence.py ${PYSITELIB}/ansible/runner/lookup_plugins/sequence.pyc ${PYSITELIB}/ansible/runner/lookup_plugins/sequence.pyo +${PYSITELIB}/ansible/runner/lookup_plugins/subelements.py +${PYSITELIB}/ansible/runner/lookup_plugins/subelements.pyc +${PYSITELIB}/ansible/runner/lookup_plugins/subelements.pyo ${PYSITELIB}/ansible/runner/lookup_plugins/template.py ${PYSITELIB}/ansible/runner/lookup_plugins/template.pyc ${PYSITELIB}/ansible/runner/lookup_plugins/template.pyo +${PYSITELIB}/ansible/runner/lookup_plugins/together.py +${PYSITELIB}/ansible/runner/lookup_plugins/together.pyc +${PYSITELIB}/ansible/runner/lookup_plugins/together.pyo ${PYSITELIB}/ansible/runner/poller.py ${PYSITELIB}/ansible/runner/poller.pyc ${PYSITELIB}/ansible/runner/poller.pyo @@ -200,204 +251,351 @@ man/man1/ansible-doc.1 man/man1/ansible-playbook.1 man/man1/ansible-pull.1 man/man1/ansible.1 +man/man3/ansible.accelerate.3 +man/man3/ansible.acl.3 man/man3/ansible.add_host.3 +man/man3/ansible.airbrake_deployment.3 man/man3/ansible.apt.3 man/man3/ansible.apt_key.3 man/man3/ansible.apt_repository.3 +man/man3/ansible.arista_interface.3 +man/man3/ansible.arista_l2interface.3 +man/man3/ansible.arista_lag.3 +man/man3/ansible.arista_vlan.3 man/man3/ansible.assemble.3 man/man3/ansible.async_status.3 man/man3/ansible.authorized_key.3 +man/man3/ansible.bigip_monitor_http.3 +man/man3/ansible.bigip_monitor_tcp.3 +man/man3/ansible.bigip_node.3 +man/man3/ansible.bigip_pool.3 +man/man3/ansible.bigip_pool_member.3 +man/man3/ansible.boundary_meter.3 man/man3/ansible.bzr.3 +man/man3/ansible.campfire.3 man/man3/ansible.cloudformation.3 man/man3/ansible.command.3 man/man3/ansible.copy.3 man/man3/ansible.cron.3 +man/man3/ansible.datadog_event.3 man/man3/ansible.debug.3 +man/man3/ansible.digital_ocean.3 man/man3/ansible.django_manage.3 +man/man3/ansible.dnsmadeeasy.3 +man/man3/ansible.docker.3 man/man3/ansible.easy_install.3 man/man3/ansible.ec2.3 +man/man3/ansible.ec2_ami.3 +man/man3/ansible.ec2_eip.3 +man/man3/ansible.ec2_elb.3 man/man3/ansible.ec2_facts.3 +man/man3/ansible.ec2_group.3 +man/man3/ansible.ec2_tag.3 man/man3/ansible.ec2_vol.3 +man/man3/ansible.ec2_vpc.3 +man/man3/ansible.ejabberd_user.3 +man/man3/ansible.elasticache.3 man/man3/ansible.facter.3 man/man3/ansible.fail.3 man/man3/ansible.fetch.3 man/man3/ansible.file.3 +man/man3/ansible.filesystem.3 man/man3/ansible.fireball.3 +man/man3/ansible.firewalld.3 +man/man3/ansible.flowdock.3 +man/man3/ansible.gc_storage.3 +man/man3/ansible.gce.3 +man/man3/ansible.gce_lb.3 +man/man3/ansible.gce_net.3 +man/man3/ansible.gce_pd.3 man/man3/ansible.gem.3 man/man3/ansible.get_url.3 man/man3/ansible.git.3 +man/man3/ansible.github_hooks.3 +man/man3/ansible.glance_image.3 man/man3/ansible.group.3 man/man3/ansible.group_by.3 +man/man3/ansible.grove.3 man/man3/ansible.hg.3 +man/man3/ansible.hipchat.3 man/man3/ansible.homebrew.3 +man/man3/ansible.hostname.3 +man/man3/ansible.htpasswd.3 +man/man3/ansible.include_vars.3 man/man3/ansible.ini_file.3 +man/man3/ansible.irc.3 +man/man3/ansible.jabber.3 +man/man3/ansible.jboss.3 +man/man3/ansible.kernel_blacklist.3 +man/man3/ansible.keystone_user.3 man/man3/ansible.lineinfile.3 +man/man3/ansible.linode.3 man/man3/ansible.lvg.3 man/man3/ansible.lvol.3 man/man3/ansible.macports.3 man/man3/ansible.mail.3 +man/man3/ansible.modprobe.3 man/man3/ansible.mongodb_user.3 +man/man3/ansible.monit.3 man/man3/ansible.mount.3 +man/man3/ansible.mqtt.3 man/man3/ansible.mysql_db.3 +man/man3/ansible.mysql_replication.3 man/man3/ansible.mysql_user.3 +man/man3/ansible.mysql_variables.3 man/man3/ansible.nagios.3 man/man3/ansible.netscaler.3 +man/man3/ansible.newrelic_deployment.3 +man/man3/ansible.nova_compute.3 +man/man3/ansible.nova_keypair.3 +man/man3/ansible.npm.3 man/man3/ansible.ohai.3 +man/man3/ansible.open_iscsi.3 man/man3/ansible.openbsd_pkg.3 +man/man3/ansible.openvswitch_bridge.3 +man/man3/ansible.openvswitch_port.3 man/man3/ansible.opkg.3 +man/man3/ansible.osx_say.3 +man/man3/ansible.ovirt.3 man/man3/ansible.pacman.3 +man/man3/ansible.pagerduty.3 man/man3/ansible.pause.3 man/man3/ansible.ping.3 +man/man3/ansible.pingdom.3 man/man3/ansible.pip.3 man/man3/ansible.pkgin.3 +man/man3/ansible.pkgng.3 +man/man3/ansible.pkgutil.3 +man/man3/ansible.portinstall.3 man/man3/ansible.postgresql_db.3 +man/man3/ansible.postgresql_privs.3 man/man3/ansible.postgresql_user.3 +man/man3/ansible.quantum_floating_ip.3 +man/man3/ansible.quantum_floating_ip_associate.3 +man/man3/ansible.quantum_network.3 +man/man3/ansible.quantum_router.3 +man/man3/ansible.quantum_router_gateway.3 +man/man3/ansible.quantum_router_interface.3 +man/man3/ansible.quantum_subnet.3 man/man3/ansible.rabbitmq_parameter.3 man/man3/ansible.rabbitmq_plugin.3 man/man3/ansible.rabbitmq_user.3 man/man3/ansible.rabbitmq_vhost.3 man/man3/ansible.raw.3 +man/man3/ansible.rax.3 +man/man3/ansible.rax_clb.3 +man/man3/ansible.rax_clb_nodes.3 +man/man3/ansible.rax_facts.3 +man/man3/ansible.rax_network.3 +man/man3/ansible.rds.3 +man/man3/ansible.redhat_subscription.3 +man/man3/ansible.redis.3 man/man3/ansible.rhn_channel.3 +man/man3/ansible.rhn_register.3 +man/man3/ansible.riak.3 +man/man3/ansible.route53.3 +man/man3/ansible.rpm_key.3 man/man3/ansible.s3.3 man/man3/ansible.script.3 man/man3/ansible.seboolean.3 man/man3/ansible.selinux.3 man/man3/ansible.service.3 +man/man3/ansible.set_fact.3 man/man3/ansible.setup.3 man/man3/ansible.shell.3 man/man3/ansible.slurp.3 +man/man3/ansible.stat.3 man/man3/ansible.subversion.3 man/man3/ansible.supervisorctl.3 man/man3/ansible.svr4pkg.3 +man/man3/ansible.swdepot.3 +man/man3/ansible.synchronize.3 man/man3/ansible.sysctl.3 man/man3/ansible.template.3 +man/man3/ansible.unarchive.3 man/man3/ansible.uri.3 +man/man3/ansible.urpmi.3 man/man3/ansible.user.3 -man/man3/ansible.vagrant.3 man/man3/ansible.virt.3 man/man3/ansible.wait_for.3 +man/man3/ansible.xattr.3 man/man3/ansible.yum.3 man/man3/ansible.zfs.3 -share/ansible/add_host -share/ansible/apt -share/ansible/apt_key -share/ansible/apt_repository -share/ansible/assemble -share/ansible/async_status -share/ansible/async_wrapper -share/ansible/authorized_key -share/ansible/bzr -share/ansible/cloudformation -share/ansible/command -share/ansible/copy -share/ansible/cron -share/ansible/debug -share/ansible/django_manage -share/ansible/easy_install -share/ansible/ec2 -share/ansible/ec2_facts -share/ansible/ec2_vol -share/ansible/facter -share/ansible/fail -share/ansible/fetch -share/ansible/file -share/ansible/fireball -share/ansible/gem -share/ansible/get_url -share/ansible/git -share/ansible/group -share/ansible/group_by -share/ansible/hg -share/ansible/homebrew -share/ansible/ini_file -share/ansible/lineinfile -share/ansible/lvg -share/ansible/lvol -share/ansible/macports -share/ansible/mail -share/ansible/mongodb_user -share/ansible/mount -share/ansible/mysql_db -share/ansible/mysql_user -share/ansible/nagios -share/ansible/netscaler -share/ansible/ohai -share/ansible/openbsd_pkg -share/ansible/opkg -share/ansible/pacman -share/ansible/pause -share/ansible/ping -share/ansible/pip -share/ansible/pkgin -share/ansible/postgresql_db -share/ansible/postgresql_user -share/ansible/rabbitmq_parameter -share/ansible/rabbitmq_plugin -share/ansible/rabbitmq_user -share/ansible/rabbitmq_vhost -share/ansible/raw -share/ansible/rhn_channel -share/ansible/s3 -share/ansible/script -share/ansible/seboolean -share/ansible/selinux -share/ansible/service -share/ansible/setup -share/ansible/shell -share/ansible/slurp -share/ansible/subversion -share/ansible/supervisorctl -share/ansible/svr4pkg -share/ansible/sysctl -share/ansible/template -share/ansible/uri -share/ansible/user -share/ansible/vagrant -share/ansible/virt -share/ansible/wait_for -share/ansible/yum -share/ansible/zfs +man/man3/ansible.zypper.3 +man/man3/ansible.zypper_repository.3 +share/ansible/cloud/cloudformation +share/ansible/cloud/digital_ocean +share/ansible/cloud/docker +share/ansible/cloud/ec2 +share/ansible/cloud/ec2_ami +share/ansible/cloud/ec2_eip +share/ansible/cloud/ec2_elb +share/ansible/cloud/ec2_facts +share/ansible/cloud/ec2_group +share/ansible/cloud/ec2_tag +share/ansible/cloud/ec2_vol +share/ansible/cloud/ec2_vpc +share/ansible/cloud/elasticache +share/ansible/cloud/gc_storage +share/ansible/cloud/gce +share/ansible/cloud/gce_lb +share/ansible/cloud/gce_net +share/ansible/cloud/gce_pd +share/ansible/cloud/glance_image +share/ansible/cloud/keystone_user +share/ansible/cloud/linode +share/ansible/cloud/nova_compute +share/ansible/cloud/nova_keypair +share/ansible/cloud/ovirt +share/ansible/cloud/quantum_floating_ip +share/ansible/cloud/quantum_floating_ip_associate +share/ansible/cloud/quantum_network +share/ansible/cloud/quantum_router +share/ansible/cloud/quantum_router_gateway +share/ansible/cloud/quantum_router_interface +share/ansible/cloud/quantum_subnet +share/ansible/cloud/rax +share/ansible/cloud/rax_clb +share/ansible/cloud/rax_clb_nodes +share/ansible/cloud/rax_facts +share/ansible/cloud/rax_network +share/ansible/cloud/rds +share/ansible/cloud/route53 +share/ansible/cloud/s3 +share/ansible/cloud/virt +share/ansible/commands/command +share/ansible/commands/raw +share/ansible/commands/script +share/ansible/commands/shell +share/ansible/database/mongodb_user +share/ansible/database/mysql_db +share/ansible/database/mysql_replication +share/ansible/database/mysql_user +share/ansible/database/mysql_variables +share/ansible/database/postgresql_db +share/ansible/database/postgresql_privs +share/ansible/database/postgresql_user +share/ansible/database/redis +share/ansible/database/riak +share/ansible/files/acl +share/ansible/files/assemble +share/ansible/files/copy +share/ansible/files/fetch +share/ansible/files/file +share/ansible/files/ini_file +share/ansible/files/lineinfile +share/ansible/files/stat +share/ansible/files/synchronize +share/ansible/files/template +share/ansible/files/unarchive +share/ansible/files/xattr +share/ansible/internal/async_status +share/ansible/internal/async_wrapper +share/ansible/inventory/add_host +share/ansible/inventory/group_by +share/ansible/messaging/rabbitmq_parameter +share/ansible/messaging/rabbitmq_plugin +share/ansible/messaging/rabbitmq_user +share/ansible/messaging/rabbitmq_vhost +share/ansible/monitoring/airbrake_deployment +share/ansible/monitoring/boundary_meter +share/ansible/monitoring/datadog_event +share/ansible/monitoring/monit +share/ansible/monitoring/nagios +share/ansible/monitoring/newrelic_deployment +share/ansible/monitoring/pagerduty +share/ansible/monitoring/pingdom +share/ansible/net_infrastructure/arista_interface +share/ansible/net_infrastructure/arista_l2interface +share/ansible/net_infrastructure/arista_lag +share/ansible/net_infrastructure/arista_vlan +share/ansible/net_infrastructure/bigip_monitor_http +share/ansible/net_infrastructure/bigip_monitor_tcp +share/ansible/net_infrastructure/bigip_node +share/ansible/net_infrastructure/bigip_pool +share/ansible/net_infrastructure/bigip_pool_member +share/ansible/net_infrastructure/dnsmadeeasy +share/ansible/net_infrastructure/netscaler +share/ansible/net_infrastructure/openvswitch_bridge +share/ansible/net_infrastructure/openvswitch_port +share/ansible/network/get_url +share/ansible/network/slurp +share/ansible/network/uri +share/ansible/notification/campfire +share/ansible/notification/flowdock +share/ansible/notification/grove +share/ansible/notification/hipchat +share/ansible/notification/irc +share/ansible/notification/jabber +share/ansible/notification/mail +share/ansible/notification/mqtt +share/ansible/notification/osx_say +share/ansible/packaging/apt +share/ansible/packaging/apt_key +share/ansible/packaging/apt_repository +share/ansible/packaging/easy_install +share/ansible/packaging/gem +share/ansible/packaging/homebrew +share/ansible/packaging/macports +share/ansible/packaging/npm +share/ansible/packaging/openbsd_pkg +share/ansible/packaging/opkg +share/ansible/packaging/pacman +share/ansible/packaging/pip +share/ansible/packaging/pkgin +share/ansible/packaging/pkgng +share/ansible/packaging/pkgutil +share/ansible/packaging/portinstall +share/ansible/packaging/redhat_subscription +share/ansible/packaging/rhn_channel +share/ansible/packaging/rhn_register +share/ansible/packaging/rpm_key +share/ansible/packaging/svr4pkg +share/ansible/packaging/swdepot +share/ansible/packaging/urpmi +share/ansible/packaging/yum +share/ansible/packaging/zypper +share/ansible/packaging/zypper_repository +share/ansible/source_control/bzr +share/ansible/source_control/git +share/ansible/source_control/github_hooks +share/ansible/source_control/hg +share/ansible/source_control/subversion +share/ansible/system/authorized_key +share/ansible/system/cron +share/ansible/system/facter +share/ansible/system/filesystem +share/ansible/system/firewalld +share/ansible/system/group +share/ansible/system/hostname +share/ansible/system/kernel_blacklist +share/ansible/system/lvg +share/ansible/system/lvol +share/ansible/system/modprobe +share/ansible/system/mount +share/ansible/system/ohai +share/ansible/system/open_iscsi +share/ansible/system/ping +share/ansible/system/seboolean +share/ansible/system/selinux +share/ansible/system/service +share/ansible/system/setup +share/ansible/system/sysctl +share/ansible/system/user +share/ansible/system/zfs +share/ansible/utilities/accelerate +share/ansible/utilities/debug +share/ansible/utilities/fail +share/ansible/utilities/fireball +share/ansible/utilities/include_vars +share/ansible/utilities/pause +share/ansible/utilities/set_fact +share/ansible/utilities/wait_for +share/ansible/web_infrastructure/django_manage +share/ansible/web_infrastructure/ejabberd_user +share/ansible/web_infrastructure/htpasswd +share/ansible/web_infrastructure/jboss +share/ansible/web_infrastructure/supervisorctl share/examples/ansible/ansible.cfg share/examples/ansible/hosts -share/examples/ansible/playbooks/ansible_pull.yml -share/examples/ansible/playbooks/batch_size_control.yml -share/examples/ansible/playbooks/complex_args.yml -share/examples/ansible/playbooks/conditionals_part1.yml -share/examples/ansible/playbooks/conditionals_part2.yml -share/examples/ansible/playbooks/conditionals_part3.yml -share/examples/ansible/playbooks/custom_filters.yml -share/examples/ansible/playbooks/delegation.yml -share/examples/ansible/playbooks/environment.yml -share/examples/ansible/playbooks/eucalyptus-ec2.yml -share/examples/ansible/playbooks/file_secontext.yml -share/examples/ansible/playbooks/filter_plugins/custom_plugins.py -share/examples/ansible/playbooks/get_url.yml -share/examples/ansible/playbooks/group_by.yml -share/examples/ansible/playbooks/group_commands.yml -share/examples/ansible/playbooks/handlers/handlers.yml -share/examples/ansible/playbooks/intermediate_example.yml -share/examples/ansible/playbooks/intro_example.yml -share/examples/ansible/playbooks/loop_nested.yml -share/examples/ansible/playbooks/loop_plugins.yml -share/examples/ansible/playbooks/loop_with_items.yml -share/examples/ansible/playbooks/mysql.yml -share/examples/ansible/playbooks/nested_playbooks.yml -share/examples/ansible/playbooks/netscaler.yml -share/examples/ansible/playbooks/postgresql.yml -share/examples/ansible/playbooks/prompts.yml -share/examples/ansible/playbooks/rabbitmq.yml -share/examples/ansible/playbooks/register_logic.yml -share/examples/ansible/playbooks/selective_file_sources.yml -share/examples/ansible/playbooks/tags.yml -share/examples/ansible/playbooks/tasks/base.yml -share/examples/ansible/playbooks/templates/custom-filters.j2 -share/examples/ansible/playbooks/templates/etc_cron.d_ansible-pull.j2 -share/examples/ansible/playbooks/templates/etc_logrotate.d_ansible-pull.j2 -share/examples/ansible/playbooks/templates/foo.j2 -share/examples/ansible/playbooks/templates/hostvars.j2 -share/examples/ansible/playbooks/user_commands.yml -share/examples/ansible/playbooks/vars/CentOS.yml -share/examples/ansible/playbooks/vars/defaults.yml -share/examples/ansible/playbooks/vars/external_vars.yml -share/examples/ansible/playbooks/zfs.yml @pkgdir etc/ansible diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo index b3f10fa1fe2..cd0b6c77f5d 100644 --- a/sysutils/ansible/distinfo +++ b/sysutils/ansible/distinfo @@ -1,17 +1,13 @@ -$NetBSD: distinfo,v 1.4 2013/04/13 17:51:57 riz Exp $ +$NetBSD: distinfo,v 1.5 2013/12/02 22:54:46 hubertf Exp $ -SHA1 (ansible-1.1.tar.gz) = fa1009e80b624945675bbaba690b895a1ff050fd -RMD160 (ansible-1.1.tar.gz) = 220dd91db3ab0d6df5dec456448e22d436077f3d -Size (ansible-1.1.tar.gz) = 302115 bytes -SHA1 (patch-docs_man_man1_ansible-playbook.1) = 33ce57bccb6cb29e978871a868bf26ca17d87660 -SHA1 (patch-docs_man_man1_ansible.1) = 266a520f8f227686cc84b8a3e9b6fac8e20e1247 -SHA1 (patch-examples_ansible.cfg) = 631236fadaadfd28d71b7bc7cce33e62691ee407 -SHA1 (patch-lib_ansible_callbacks.py) = 607809cf64a676ef91a70b915e97ac87b8ddd31b -SHA1 (patch-lib_ansible_constants.py) = 51171c84680b18a2d1ff2401cc1fd08e009aa83c -SHA1 (patch-library_mysql_db) = 45e782d41c3e2bc9e462441205f894e7089d798a -SHA1 (patch-library_ping) = 6bb9b946df3a44ac938eee7e752bf2149936b8e6 -SHA1 (patch-library_pkgin) = 4b57890efa9145c0b2b68c2c75c990618488d824 -SHA1 (patch-library_raw) = 897aa5b8e5abadd23adc6de178cbec417c43e540 -SHA1 (patch-library_setup) = 7489a5c905916cc1559db15b730a1a93cb782971 -SHA1 (patch-library_slurp) = 54a021519554c3eb95daf9396c32d6ec559ddab8 -SHA1 (patch-library_virt) = b01c7b2d7cd49ad7720d3a1430d7bba41673d2a6 +SHA1 (ansible-1.4.1.tar.gz) = 670fda6b9c4869820d80c6e873604ec759dfa03c +RMD160 (ansible-1.4.1.tar.gz) = c1d2248244d6799e8ea79e5bfb3e96579c066594 +Size (ansible-1.4.1.tar.gz) = 571296 bytes +SHA1 (patch-examples_ansible.cfg) = 2a2e3841735df3bddeb6e569e2fdc659ae305053 +SHA1 (patch-lib_ansible_callbacks.py) = bbede537853ab35f31727b72cda41835c7700074 +SHA1 (patch-lib_ansible_constants.py) = eb9379937555b28f8b0f7932d54042432197c59d +SHA1 (patch-library-system-ping) = 74f4df32948d9a52998420a01f38828dd00c31b6 +SHA1 (patch-library_database_riak) = 7efb167fd9a0e2bd9c7ac5fad3b426c1aa6d5272 +SHA1 (patch-library_monitoring_nagios) = a677946b5c83bab4c3fa3c8d078b28d8abdd7030 +SHA1 (patch-library_packaging_pkgin) = 247f583e3be5cd28462cd274d640ac44652fac50 +SHA1 (patch-library_system_setup) = d87259d0585f750b8f7baf43cc4254138bbbcf72 diff --git a/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1 b/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1 deleted file mode 100644 index b94ca5d3923..00000000000 --- a/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1 +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-docs_man_man1_ansible-playbook.1,v 1.2 2013/04/13 17:51:57 riz Exp $ - ---- docs/man/man1/ansible-playbook.1.orig 2013-04-13 08:48:00.000000000 -0700 -+++ docs/man/man1/ansible-playbook.1 2013-04-13 08:50:25.000000000 -0700 -@@ -44,7 +44,7 @@ - The - \fIPATH\fR - to the inventory hosts file, which defaults to --\fI/etc/ansible/hosts\fR\&. -+\fI@PKG_SYSCONFDIR@/ansible/hosts\fR\&. - .RE - .PP - \fB\-M\fR \fIDIRECTORY\fR, \fB\-\-module\-path=\fR\fIDIRECTORY\fR -@@ -52,7 +52,7 @@ - The - \fIDIRECTORY\fR - to load modules from\&. The default is --\fI/usr/share/ansible\fR\&. -+\fI@PREFIX@/share/ansible\fR\&. - .RE - .PP - \fB\-e\fR \fIVARS\fR, \fB\-\-extra\-vars=\fR\fIVARS\fR -@@ -142,11 +142,11 @@ - ANSIBLE_LIBRARY \(em Override the default ansible module library path - .SH "FILES" - .sp --/etc/ansible/hosts \(em Default inventory file -+@PKG_SYSCONFDIR@/ansible/hosts \(em Default inventory file - .sp --/usr/share/ansible/ \(em Default module library -+@PREFIX@/share/ansible/ \(em Default module library - .sp --/etc/ansible/ansible\&.cfg \(em Config file, used if present -+@PKG_SYSCONFDIR@/ansible/ansible\&.cfg \(em Config file, used if present - .sp - ~/\&.ansible\&.cfg \(em User config file, overrides the default config if present - .SH "AUTHOR" diff --git a/sysutils/ansible/patches/patch-docs_man_man1_ansible.1 b/sysutils/ansible/patches/patch-docs_man_man1_ansible.1 deleted file mode 100644 index 02b96337c25..00000000000 --- a/sysutils/ansible/patches/patch-docs_man_man1_ansible.1 +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-docs_man_man1_ansible.1,v 1.2 2013/04/13 17:51:57 riz Exp $ - ---- docs/man/man1/ansible.1.orig 2013-04-13 08:53:23.000000000 -0700 -+++ docs/man/man1/ansible.1 2013-04-13 08:55:50.000000000 -0700 -@@ -44,7 +44,7 @@ - The - \fIPATH\fR - to the inventory hosts file, which defaults to --\fI/etc/ansible/hosts\fR\&. -+\fI@PREFIX@/ansible/hosts\fR\&. - .RE - .PP - \fB\-f\fR \fINUM\fR, \fB\-\-forks=\fR\fINUM\fR -@@ -70,7 +70,7 @@ - The - \fIDIRECTORY\fR - to load modules from\&. The default is --\fI/usr/share/ansible\fR\&. -+\fI@PREFIX@/share/ansible\fR\&. - .RE - .PP - \fB\-a\fR \'\fIARGUMENTS\fR\', \fB\-\-args=\fR\'\fIARGUMENTS\fR\' -@@ -168,11 +168,11 @@ - Ranges of hosts are also supported\&. For more information and additional options, see the documentation on http://ansible\&.github\&.com/\&. - .SH "FILES" - .sp --/etc/ansible/hosts \(em Default inventory file -+@PREFIX@/ansible/hosts \(em Default inventory file - .sp --/usr/share/ansible/ \(em Default module library -+@PREFIX@/share/ansible/ \(em Default module library - .sp --/etc/ansible/ansible\&.cfg \(em Config file, used if present -+@PREFIX@/ansible/ansible\&.cfg \(em Config file, used if present - .sp - ~/\&.ansible\&.cfg \(em User config file, overrides the default config if present - .SH "ENVIRONMENT" diff --git a/sysutils/ansible/patches/patch-examples_ansible.cfg b/sysutils/ansible/patches/patch-examples_ansible.cfg index e5d8816deae..2fc1287a141 100644 --- a/sysutils/ansible/patches/patch-examples_ansible.cfg +++ b/sysutils/ansible/patches/patch-examples_ansible.cfg @@ -1,31 +1,29 @@ -$NetBSD: patch-examples_ansible.cfg,v 1.1 2013/02/26 17:42:59 riz Exp $ +$NetBSD: patch-examples_ansible.cfg,v 1.2 2013/12/02 22:54:46 hubertf Exp $ ---- examples/ansible.cfg.orig 2013-02-25 11:33:44.000000000 -0800 -+++ examples/ansible.cfg 2013-02-25 11:36:25.000000000 -0800 -@@ -1,16 +1,16 @@ - # config file for ansible -- http://ansible.github.com - # nearly all parameters can be overridden in ansible-playbook or with command line flags --# ansible will read ~/.ansible.cfg or /etc/ansible/ansible.cfg, whichever it finds first -+# ansible will read ~/.ansible.cfg or @PKG_SYSCONFDIR@/ansible/ansible.cfg, whichever it finds first +--- examples/ansible.cfg.orig 2013-11-19 19:12:32.000000000 +0000 ++++ examples/ansible.cfg +@@ -4,14 +4,14 @@ + # nearly all parameters can be overridden in ansible-playbook + # or with command line flags. ansible will read ~/.ansible.cfg, + # ansible.cfg in the current working directory or +-# /etc/ansible/ansible.cfg, whichever it finds first ++# @PKG_SYSCONFDIR@/ansible/ansible.cfg, whichever it finds first [defaults] - # location of inventory file, eliminates need to specify -i + # some basic default values... --hostfile = /etc/ansible/hosts -+hostfile = @PKG_SYSCONFDIR@/ansible/hosts - - # location of ansible library, eliminates need to specify --module-path - --library = /usr/share/ansible -+library = @PREFIX@/share/ansible - - # default module name used in /usr/bin/ansible when -m is not specified - -@@ -104,12 +104,12 @@ - - # additional plugin paths for non-core plugins +-hostfile = /etc/ansible/hosts +-library = /usr/share/ansible ++hostfile = @PKG_SYSCONFDIR@/ansible/hosts ++library = @PREFIX@/share/ansible + remote_tmp = $HOME/.ansible/tmp + pattern = * + forks = 5 +@@ -87,12 +87,12 @@ ansible_managed = Ansible managed: {file + #error_on_undefined_vars = False + # set plugin path directories here, seperate with colons -action_plugins = /usr/share/ansible_plugins/action_plugins -callback_plugins = /usr/share/ansible_plugins/callback_plugins -connection_plugins = /usr/share/ansible_plugins/connection_plugins @@ -39,5 +37,5 @@ $NetBSD: patch-examples_ansible.cfg,v 1.1 2013/02/26 17:42:59 riz Exp $ +vars_plugins = @PREFIX@/share/ansible_plugins/vars_plugins +filter_plugins = @PREFIX@/share/ansible_plugins/filter_plugins - [paramiko_connection] - + # don't like cows? that's unfortunate. + # set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 diff --git a/sysutils/ansible/patches/patch-lib_ansible_callbacks.py b/sysutils/ansible/patches/patch-lib_ansible_callbacks.py index c4185119e44..221de065b1f 100644 --- a/sysutils/ansible/patches/patch-lib_ansible_callbacks.py +++ b/sysutils/ansible/patches/patch-lib_ansible_callbacks.py @@ -1,16 +1,16 @@ -$NetBSD: patch-lib_ansible_callbacks.py,v 1.2 2013/04/13 17:51:57 riz Exp $ +$NetBSD: patch-lib_ansible_callbacks.py,v 1.3 2013/12/02 22:54:46 hubertf Exp $ ---- lib/ansible/callbacks.py.orig 2013-03-30 16:29:28.000000000 -0700 -+++ lib/ansible/callbacks.py 2013-04-13 09:05:36.000000000 -0700 -@@ -30,9 +30,9 @@ - cowsay = "/usr/bin/cowsay" - elif os.path.exists("/usr/games/cowsay"): - cowsay = "/usr/games/cowsay" --elif os.path.exists("/usr/local/bin/cowsay"): -+elif os.path.exists("@LOCALBASE@/bin/cowsay"): - # BSD path for cowsay -- cowsay = "/usr/local/bin/cowsay" -+ cowsay = "@LOCALBASE@/bin/cowsay" - elif os.path.exists("/opt/local/bin/cowsay"): - # MacPorts path for cowsay - cowsay = "/opt/local/bin/cowsay" +--- lib/ansible/callbacks.py.orig 2013-11-19 19:12:32.000000000 +0000 ++++ lib/ansible/callbacks.py +@@ -55,9 +55,9 @@ def get_cowsay_info(): + cowsay = "/usr/bin/cowsay" + elif os.path.exists("/usr/games/cowsay"): + cowsay = "/usr/games/cowsay" +- elif os.path.exists("/usr/local/bin/cowsay"): ++ elif os.path.exists("@LOCALBASE@/bin/cowsay"): + # BSD path for cowsay +- cowsay = "/usr/local/bin/cowsay" ++ cowsay = "@LOCALBASE@/bin/cowsay" + elif os.path.exists("/opt/local/bin/cowsay"): + # MacPorts path for cowsay + cowsay = "/opt/local/bin/cowsay" diff --git a/sysutils/ansible/patches/patch-lib_ansible_constants.py b/sysutils/ansible/patches/patch-lib_ansible_constants.py index 81da9b2d1ff..546544cf2be 100644 --- a/sysutils/ansible/patches/patch-lib_ansible_constants.py +++ b/sysutils/ansible/patches/patch-lib_ansible_constants.py @@ -1,48 +1,50 @@ -$NetBSD: patch-lib_ansible_constants.py,v 1.3 2013/04/13 17:51:57 riz Exp $ +$NetBSD: patch-lib_ansible_constants.py,v 1.4 2013/12/02 22:54:46 hubertf Exp $ ---- lib/ansible/constants.py.orig 2013-03-04 13:18:12.000000000 -0800 -+++ lib/ansible/constants.py 2013-04-13 09:48:31.000000000 -0700 -@@ -36,7 +36,7 @@ +--- lib/ansible/constants.py.orig 2013-11-19 19:12:32.000000000 +0000 ++++ lib/ansible/constants.py +@@ -59,7 +59,7 @@ def load_config_file(): p = ConfigParser.ConfigParser() - path1 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg")) - path2 = os.getcwd() + "/ansible.cfg" + path1 = os.getcwd() + "/ansible.cfg" + path2 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg")) - path3 = "/etc/ansible/ansible.cfg" + path3 = "@PKG_SYSCONFDIR@/ansible/ansible.cfg" if os.path.exists(path1): p.read(path1) -@@ -64,13 +64,13 @@ - if getattr(sys, "real_prefix", None): +@@ -88,7 +88,7 @@ if getattr(sys, "real_prefix", None): + # in a virtualenv DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') else: - DIST_MODULE_PATH = '/usr/share/ansible/' -+ DIST_MODULE_PATH = '@PREFIX@/share/ansible/' ++ DIST_MODULE_PATH = '@PREFIX@/share/ansible/' - # sections in config file + # check all of these extensions when looking for yaml files for things like + # group variables +@@ -98,7 +98,7 @@ YAML_FILENAME_EXTENSIONS = [ "", ".yml", DEFAULTS='defaults' # configurable things --DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts')) -+DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts')) - DEFAULT_MODULE_PATH = shell_expand_path(get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', DIST_MODULE_PATH)) +-DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts')) ++DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts')) + DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', DIST_MODULE_PATH) + DEFAULT_ROLES_PATH = get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', None) DEFAULT_REMOTE_TMP = shell_expand_path(get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp')) - DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command') -@@ -96,12 +96,12 @@ - DEFAULT_HASH_BEHAVIOUR = get_config(p, DEFAULTS, 'hash_behaviour', 'ANSIBLE_HASH_BEHAVIOUR', 'replace') +@@ -128,12 +128,12 @@ DEFAULT_LEGACY_PLAYBOOK_VARIABLES = get_ DEFAULT_JINJA2_EXTENSIONS = get_config(p, DEFAULTS, 'jinja2_extensions', 'ANSIBLE_JINJA2_EXTENSIONS', None) + DEFAULT_EXECUTABLE = get_config(p, DEFAULTS, 'executable', 'ANSIBLE_EXECUTABLE', '/bin/sh') --DEFAULT_ACTION_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '/usr/share/ansible_plugins/action_plugins')) --DEFAULT_CALLBACK_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins')) --DEFAULT_CONNECTION_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '/usr/share/ansible_plugins/connection_plugins')) --DEFAULT_LOOKUP_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '/usr/share/ansible_plugins/lookup_plugins')) --DEFAULT_VARS_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '/usr/share/ansible_plugins/vars_plugins')) --DEFAULT_FILTER_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '/usr/share/ansible_plugins/filter_plugins')) -+DEFAULT_ACTION_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '@PREFIX@/share/ansible_plugins/action_plugins')) -+DEFAULT_CALLBACK_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '@PREFIX@/share/ansible_plugins/callback_plugins')) -+DEFAULT_CONNECTION_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '@PREFIX@/share/ansible_plugins/connection_plugins')) -+DEFAULT_LOOKUP_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '@PREFIX@/share/ansible_plugins/lookup_plugins')) -+DEFAULT_VARS_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '@PREFIX@/share/ansible_plugins/vars_plugins')) -+DEFAULT_FILTER_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '@PREFIX@/share/ansible_plugins/filter_plugins')) +-DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '/usr/share/ansible_plugins/action_plugins') +-DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins') +-DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '/usr/share/ansible_plugins/connection_plugins') +-DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '/usr/share/ansible_plugins/lookup_plugins') +-DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '/usr/share/ansible_plugins/vars_plugins') +-DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '/usr/share/ansible_plugins/filter_plugins') ++DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '@PREFIX@/share/ansible_plugins/action_plugins') ++DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '@PREFIX@/share/ansible_plugins/callback_plugins') ++DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '@PREFIX@/share/ansible_plugins/connection_plugins') ++DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '@PREFIX@/share/ansible_plugins/lookup_plugins') ++DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '@PREFIX@/share/ansible_plugins/vars_plugins') ++DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '@PREFIX@/share/ansible_plugins/filter_plugins') + DEFAULT_LOG_PATH = shell_expand_path(get_config(p, DEFAULTS, 'log_path', 'ANSIBLE_LOG_PATH', '')) - # non-configurable things - DEFAULT_SUDO_PASS = None + ANSIBLE_NOCOLOR = get_config(p, DEFAULTS, 'nocolor', 'ANSIBLE_NOCOLOR', None, boolean=True) diff --git a/sysutils/ansible/patches/patch-library-system-ping b/sysutils/ansible/patches/patch-library-system-ping new file mode 100644 index 00000000000..709a10d7d9e --- /dev/null +++ b/sysutils/ansible/patches/patch-library-system-ping @@ -0,0 +1,13 @@ +$NetBSD: patch-library-system-ping,v 1.1 2013/12/02 22:54:46 hubertf Exp $ + +--- library/system/ping.orig 2013-11-19 19:12:32.000000000 +0000 ++++ library/system/ping +@@ -27,7 +27,7 @@ short_description: Try to connect to hos + description: + - A trivial test module, this module always returns C(pong) on successful + contact. It does not make sense in playbooks, but it is useful from +- C(/usr/bin/ansible) ++ C(@PREFIX@/ansible) + options: {} + author: Michael DeHaan + ''' diff --git a/sysutils/ansible/patches/patch-library_database_riak b/sysutils/ansible/patches/patch-library_database_riak new file mode 100644 index 00000000000..bc03fa3f0c2 --- /dev/null +++ b/sysutils/ansible/patches/patch-library_database_riak @@ -0,0 +1,13 @@ +$NetBSD: patch-library_database_riak,v 1.1 2013/12/02 22:54:46 hubertf Exp $ + +--- library/database/riak.orig 2013-09-13 20:37:23.000000000 +0000 ++++ library/database/riak +@@ -110,7 +110,7 @@ def main(): + argument_spec=dict( + command=dict(required=False, default=None, choices=[ + 'ping', 'kv_test', 'join', 'plan', 'commit']), +- config_dir=dict(default='/etc/riak'), ++ config_dir=dict(default='@PKG_SYSCONFDIR@/riak'), + http_conn=dict(required=False, default='127.0.0.1:8098'), + target_node=dict(default='riak@127.0.0.1', required=False), + wait_for_handoffs=dict(default=False, type='int'), diff --git a/sysutils/ansible/patches/patch-library_monitoring_nagios b/sysutils/ansible/patches/patch-library_monitoring_nagios new file mode 100644 index 00000000000..9769b563755 --- /dev/null +++ b/sysutils/ansible/patches/patch-library_monitoring_nagios @@ -0,0 +1,31 @@ +$NetBSD: patch-library_monitoring_nagios,v 1.1 2013/12/02 22:54:46 hubertf Exp $ + +--- library/monitoring/nagios.orig 2013-08-22 02:50:24.000000000 +0000 ++++ library/monitoring/nagios +@@ -125,6 +125,8 @@ import os.path + + def which_cmdfile(): + locations = [ ++ # pkgsrc - any OS ++ '@PKG_SYSCONFDIR@/nagios/nagios.cfg', + # rhel + '/etc/nagios/nagios.cfg', + # debian +@@ -132,7 +134,7 @@ def which_cmdfile(): + # older debian + '/etc/nagios2/nagios.cfg', + # bsd, solaris +- '/usr/local/etc/nagios/nagios.cfg', ++ '/etc/nagios/nagios.cfg', + # groundwork it monitoring + '/usr/local/groundwork/nagios/etc/nagios.cfg', + # open monitoring distribution +@@ -142,6 +144,8 @@ def which_cmdfile(): + '/usr/local/nagios/nagios.cfg', + '/opt/nagios/etc/nagios.cfg', + '/opt/nagios/nagios.cfg', ++ # pkgsrc - any OS ++ '@PKG_SYSCONFDIR@/icinga/icinga.cfg', + # icinga on debian/ubuntu + '/etc/icinga/icinga.cfg', + # icinga installed from source (default location) diff --git a/sysutils/ansible/patches/patch-library_mysql_db b/sysutils/ansible/patches/patch-library_mysql_db deleted file mode 100644 index 4f7c97b5260..00000000000 --- a/sysutils/ansible/patches/patch-library_mysql_db +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-library_mysql_db,v 1.2 2013/04/13 17:51:57 riz Exp $ - ---- library/mysql_db.orig 2013-03-30 16:29:28.000000000 -0700 -+++ library/mysql_db 2013-04-13 09:13:23.000000000 -0700 -@@ -109,13 +109,13 @@ - return True - - def db_dump(host, user, password, db_name, target): -- res = os.system("/usr/bin/mysqldump -q -h "+host+"-u "+user+ " -p"+password+" " -+ res = os.system("@LOCALBASE@/bin/mysqldump -q -h "+host+"-u "+user+ " -p"+password+" " - +db_name+" > " - +target) - return (res == 0) - - def db_import(host, user, password, db_name, target): -- res = os.system("/usr/bin/mysql -h "+host+" -u "+user+ " -p"+password+" " -+ res = os.system("@LOCALBASE@/bin/mysql -h "+host+" -u "+user+ " -p"+password+" " - +db_name+" < " - +target) - return (res == 0) diff --git a/sysutils/ansible/patches/patch-library_pkgin b/sysutils/ansible/patches/patch-library_packaging_pkgin index 3f2cf827de3..b5f5d36a5ff 100644 --- a/sysutils/ansible/patches/patch-library_pkgin +++ b/sysutils/ansible/patches/patch-library_packaging_pkgin @@ -1,8 +1,8 @@ -$NetBSD: patch-library_pkgin,v 1.2 2013/04/13 17:51:57 riz Exp $ +$NetBSD: patch-library_packaging_pkgin,v 1.1 2013/12/02 22:54:46 hubertf Exp $ ---- library/pkgin.orig 2013-03-30 16:29:28.000000000 -0700 -+++ library/pkgin 2013-04-13 09:36:29.000000000 -0700 -@@ -118,7 +118,7 @@ +--- library//packaging/pkgin.orig 2013-08-22 02:50:24.000000000 +0000 ++++ library//packaging/pkgin +@@ -150,7 +150,7 @@ def main(): state = dict(default="present", choices=["present","absent"]), name = dict(aliases=["pkg"], required=True))) diff --git a/sysutils/ansible/patches/patch-library_ping b/sysutils/ansible/patches/patch-library_ping deleted file mode 100644 index e01357f688a..00000000000 --- a/sysutils/ansible/patches/patch-library_ping +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-library_ping,v 1.1 2013/02/26 00:13:00 hubertf Exp $ - ---- library/ping.orig 2012-11-23 15:56:11.000000000 +0000 -+++ library/ping -@@ -26,7 +26,7 @@ short_description: Try to connect to hos - description: - - A trivial test module, this module always returns C(pong) on successful - contact. It does not make sense in playbooks, but it is useful from -- C(/usr/bin/ansible) -+ C(@LOCALBASE@/bin/ansible) - options: {} - examples: - - code: ansible webservers -m ping diff --git a/sysutils/ansible/patches/patch-library_raw b/sysutils/ansible/patches/patch-library_raw deleted file mode 100644 index e8dfe47b5a0..00000000000 --- a/sysutils/ansible/patches/patch-library_raw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-library_raw,v 1.1 2013/02/26 00:13:00 hubertf Exp $ - ---- library/raw.orig 2013-01-20 14:03:36.000000000 +0000 -+++ library/raw -@@ -28,7 +28,7 @@ description: - - This module does not require python on the remote system, much like - the M(script) module. - examples: -- - description: Example from C(/usr/bin/ansible) to bootstrap a legacy python 2.4 host -+ - description: Example from C(@LOCALBASE@/bin/ansible) to bootstrap a legacy python 2.4 host - code: "action: raw yum -y install python-simplejson" - notes: - - If you want to execute a command securely and predictably, it may be diff --git a/sysutils/ansible/patches/patch-library_setup b/sysutils/ansible/patches/patch-library_setup deleted file mode 100644 index e1ebf57fcee..00000000000 --- a/sysutils/ansible/patches/patch-library_setup +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-library_setup,v 1.2 2013/04/13 17:51:57 riz Exp $ - ---- library/setup.orig 2013-04-02 17:33:54.000000000 -0700 -+++ library/setup 2013-04-13 09:39:00.000000000 -0700 -@@ -43,7 +43,7 @@ - description: - - This module is automatically called by playbooks to gather useful - variables about remote hosts that can be used in playbooks. It can also be -- executed directly by C(/usr/bin/ansible) to check what variables are -+ executed directly by C(@LOCALBASE@/bin/ansible) to check what variables are - available to a host. Ansible provides many I(facts) about the system, - automatically. - notes: -@@ -111,7 +111,7 @@ - { 'path' : '/usr/bin/zypper', 'name' : 'zypper' }, - { 'path' : '/usr/bin/pacman', 'name' : 'pacman' }, - { 'path' : '/bin/opkg', 'name' : 'opkg' }, -- { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' }, -+ { 'path' : '@LOCALBASE@/bin/pkgin', 'name' : 'pkgin' }, - { 'path' : '/opt/local/bin/port', 'name' : 'macports' }, - { 'path' : '/sbin/apk', 'name' : 'apk' }, - ] -@@ -1531,8 +1531,8 @@ - # if facter is installed, and we can use --json because - # ruby-json is ALSO installed, include facter data in the JSON - -- if os.path.exists("/usr/bin/facter"): -- rc, out, err = module.run_command("/usr/bin/facter --json") -+ if os.path.exists("@LOCALBASE@/bin/facter"): -+ rc, out, err = module.run_command("@LOCALBASE@/bin/facter --json") - facter = True - try: - facter_ds = json.loads(out) -@@ -1546,8 +1546,8 @@ - # because it contains a lot of nested stuff we can't use for - # templating w/o making a nicer key for it (TODO) - -- if os.path.exists("/usr/bin/ohai"): -- rc, out, err = module.run_command("/usr/bin/ohai") -+ if os.path.exists("@LOCALBASE@/bin/ohai"): -+ rc, out, err = module.run_command("@LOCALBASE@/bin/ohai") - ohai = True - try: - ohai_ds = json.loads(out) diff --git a/sysutils/ansible/patches/patch-library_slurp b/sysutils/ansible/patches/patch-library_slurp deleted file mode 100644 index 8239bbef2ea..00000000000 --- a/sysutils/ansible/patches/patch-library_slurp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-library_slurp,v 1.1 2013/02/26 00:13:00 hubertf Exp $ - ---- library/slurp.orig 2012-11-23 15:56:11.000000000 +0000 -+++ library/slurp -@@ -40,7 +40,7 @@ examples: - "content": "aGVsbG8gQW5zaWJsZSB3b3JsZAo=", - "encoding": "base64" - } -- description: "Example using C(/usr/bin/ansible)" -+ description: "Example using C(@LOCALBASE@/bin/ansible)" - notes: - - "See also: M(fetch)" - requirements: [] diff --git a/sysutils/ansible/patches/patch-library_system_setup b/sysutils/ansible/patches/patch-library_system_setup new file mode 100644 index 00000000000..b3ced979fe8 --- /dev/null +++ b/sysutils/ansible/patches/patch-library_system_setup @@ -0,0 +1,22 @@ +$NetBSD: patch-library_system_setup,v 1.1 2013/12/02 22:54:46 hubertf Exp $ + +--- library/system/setup.orig 2013-11-19 19:12:32.000000000 +0000 ++++ library/system/setup +@@ -58,7 +58,7 @@ options: + description: + - This module is automatically called by playbooks to gather useful + variables about remote hosts that can be used in playbooks. It can also be +- executed directly by C(/usr/bin/ansible) to check what variables are ++ executed directly by C(@LOCALBASE@/bin/ansible) to check what variables are + available to a host. Ansible provides many I(facts) about the system, + automatically. + notes: +@@ -129,7 +129,7 @@ class Facts(object): + { 'path' : '/usr/sbin/urpmi', 'name' : 'urpmi' }, + { 'path' : '/usr/bin/pacman', 'name' : 'pacman' }, + { 'path' : '/bin/opkg', 'name' : 'opkg' }, +- { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' }, ++ { 'path' : '@LOCALBASE@/bin/pkgin', 'name' : 'pkgin' }, + { 'path' : '/opt/local/bin/port', 'name' : 'macports' }, + { 'path' : '/sbin/apk', 'name' : 'apk' }, + { 'path' : '/usr/sbin/pkg', 'name' : 'pkgng' }, diff --git a/sysutils/ansible/patches/patch-library_virt b/sysutils/ansible/patches/patch-library_virt deleted file mode 100644 index 5ba710e5675..00000000000 --- a/sysutils/ansible/patches/patch-library_virt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-library_virt,v 1.2 2013/04/13 17:51:58 riz Exp $ - ---- library/virt.orig 2013-04-02 17:33:54.000000000 -0700 -+++ library/virt 2013-04-13 09:41:16.000000000 -0700 -@@ -48,9 +48,9 @@ - - code: "virt: name=alpha state=running" - description: "Example from Ansible Playbooks" - - code: ansible host -m virt -a "name=alpha command=status" -- description: "Example guest management with C(/usr/bin/ansible)" -+ description: "Example guest management with C(@LOCALBASE@/bin/ansible)" - - code: ansible host -m virt -a "name=alpha command=get_xml" -- description: "Use C(/usr/bin/ansible) to get the xml of the guest machine alpha" -+ description: "Use C(@LOCALBASE@/bin/ansible) to get the xml of the guest machine alpha" - requirements: [ "libvirt" ] - author: Michael DeHaan, Seth Vidal - ''' |