diff --git a/docsite/latest/README.md b/docsite/latest/README.md index 73b569c138b..0314bf8b7f4 100644 --- a/docsite/latest/README.md +++ b/docsite/latest/README.md @@ -1,7 +1,7 @@ Homepage and documentation source for the Ansible ================================================= -This project hosts the source behind [ansible.cc/docs](http://ansible.cc/docs) +This project hosts the source behind [ansibleworks.com/docs](http://www.ansibleworks.com/docs/) Contributions to the documentation are welcome. To make changes, submit a pull request that changes the restructured text files in the "rst/" directory only, and Michael can diff --git a/docsite/latest/rst/amazon_web_services.rst b/docsite/latest/rst/amazon_web_services.rst index 163a3a28b2b..67a272790ea 100644 --- a/docsite/latest/rst/amazon_web_services.rst +++ b/docsite/latest/rst/amazon_web_services.rst @@ -75,7 +75,7 @@ Host Inventory Once your nodes are spun up, you'll probably want to talk to them again. The best way to handle his is to use the ec2 inventory plugin. -Even for larger environments, you might have nodes spun up from Cloud Formations or other tooling. You don't have to use Ansible to spin up guests. Once these are created and you wish to configure them, the EC2 API can be used to return system grouping with the help of the EC2 inventory script. This script can be used to group resources by their security group or tags. Tagging is highly recommended in EC2 and can provide an easy way to sort between host groups and roles. The inventory script is documented `in the API chapter `_. +Even for larger environments, you might have nodes spun up from Cloud Formations or other tooling. You don't have to use Ansible to spin up guests. Once these are created and you wish to configure them, the EC2 API can be used to return system grouping with the help of the EC2 inventory script. This script can be used to group resources by their security group or tags. Tagging is highly recommended in EC2 and can provide an easy way to sort between host groups and roles. The inventory script is documented `in the API chapter `_. You may wish to schedule a regular refresh of the inventory cache to accomodate for frequent changes in resources: @@ -90,7 +90,7 @@ Pull Configuration For some the delay between refreshing host information and acting on that host information (i.e. running Ansible tasks against the hosts) may be too long. This may be the case in such scenarios where EC2 AutoScaling is being used to scale the number of instances as a result of a particular event. Such an event may require that hosts come online and are configured as soon as possible (even a 1 minute delay may be undesirable). Its possible to pre-bake machine images which contain the necessary ansible-pull script and components to pull and run a playbook via git. The machine images could be configured to run ansible-pull upon boot as part of the bootstrapping procedure. -More information on pull-mode playbooks can be found `here `_. +More information on pull-mode playbooks can be found `here `_. (Various developments around Ansible are also going to make this easier in the near future. Stay tuned!) diff --git a/docsite/latest/rst/contrib.rst b/docsite/latest/rst/contrib.rst index 1c0c19a227d..a264afe9fe6 100644 --- a/docsite/latest/rst/contrib.rst +++ b/docsite/latest/rst/contrib.rst @@ -13,7 +13,7 @@ Ansible modules are a way of adding new client-side logic to ansible. They can be written in any language. Generally our goal is to include most modules in core ("batteries included!"), though a few may remain outside of core depending on use cases and implementations. -- `Official "core" ansible modules `_ - various +- `Official "core" ansible modules `_ - various - `Linode `_ - Lex Toumbourou - `zypper (bash module example) `_ - jp\_mens - `additional provisioning-related modules `_ - jhoekx and dagwieers @@ -27,7 +27,7 @@ Not all modules above may take advantage of this feature. See the official docum Selected Playbooks `````````````````` -`Playbooks `_ are Ansible's +`Playbooks `_ are Ansible's configuration management language. It should be easy to write your own from scratch for most applications (we keep the language simple for EXACTLY that reason), but it can be helpful to look at what others have done for reference and see what is possible. @@ -100,9 +100,9 @@ Disclaimer Modules and playbooks here may not be using the latest in Ansible features. When in doubt to the features of a particular version of -Ansbile, always consult `ansible.cc `_ and in -particular see `Best Practices `_ for some tips -and tricks that may be useful. +Ansible, always consult `ansibleworks.com `_ and in +particular see `Best Practices `_ + for some tips and tricks that may be useful. Ansible is (C) 2012, `Michael DeHaan `_ and others and is available under the GPLv3 license. Content here is as diff --git a/docsite/latest/rst/gettingstarted.rst b/docsite/latest/rst/gettingstarted.rst index 2609888c520..a1f88ad2201 100644 --- a/docsite/latest/rst/gettingstarted.rst +++ b/docsite/latest/rst/gettingstarted.rst @@ -229,7 +229,7 @@ pointing to python3, so the right python can be found on the managed nodes. Tagged Releases +++++++++++++++ -Tarballs of releases are available on the ansible.cc page. +Tarballs of releases are available on the ansibleworks.com page. * `Ansible/downloads `_ diff --git a/docsite/latest/rst/glossary.rst b/docsite/latest/rst/glossary.rst index 5c5a1a2af9a..1cfa6347acd 100644 --- a/docsite/latest/rst/glossary.rst +++ b/docsite/latest/rst/glossary.rst @@ -34,7 +34,7 @@ and /usr/bin/ansible-playbook. Callback Plugin +++++++++++++++ -Refers to some user-written code that can intercept the results from Ansbile and do something with it. Some supplied examples +Refers to some user-written code that can intercept the results from Ansible and do something with it. Some supplied examples in the github project perform custom logging, send email, or even play sound effects. Check Mode @@ -143,7 +143,7 @@ if they are not to be accessed on the default SSH port. Host Specifier ++++++++++++++ -Each Play in Ansbile maps a series of tasks (which define the role, purpose, or orders of a system) to a set of systems. +Each Play in Ansible maps a series of tasks (which define the role, purpose, or orders of a system) to a set of systems. This "hosts:" directive in each play is often called the hosts specifier. @@ -213,7 +213,7 @@ called an "External Nodes Classifier") and works more or less exactly the same w Jinja2 ++++++ -Jinja2 is the preferred templating language of Ansbile's template module. It is a very simple Python template language that is generally +Jinja2 is the preferred templating language of Ansible's template module. It is a very simple Python template language that is generally readable and easy to write. JSON @@ -387,7 +387,7 @@ features, paramiko (the default) is a fine choice. Ansible will warn you if it Tags ++++ -Ansbile allows tagging resources in a playbook with arbitrary keywords, and then running only the parts of the playbook that +Ansible allows tagging resources in a playbook with arbitrary keywords, and then running only the parts of the playbook that correspond to those certain keywords. For instance, it is possible to have an entire OS configuration, and have certain steps labelled "ntp", and then run just the "ntp" steps to reconfigure the time server information on a remote server. diff --git a/docsite/latest/rst/playbooks.rst b/docsite/latest/rst/playbooks.rst index d0e0506780f..c29dda64688 100644 --- a/docsite/latest/rst/playbooks.rst +++ b/docsite/latest/rst/playbooks.rst @@ -143,7 +143,7 @@ The `vars` section contains a list of variables and values that can be used in t .. note:: You can also keep variables in separate files and include them alongside inline `vars` with a `vars_files` declaration - in the play. See the `Advanced Playbooks chapter `_ + in the play. See the `Advanced Playbooks chapter `_ for more info. These variables can be used later in the playbook like this:: diff --git a/docsite/latest/rst/playbooks2.rst b/docsite/latest/rst/playbooks2.rst index ccbc07f3dc9..6df919ce58a 100644 --- a/docsite/latest/rst/playbooks2.rst +++ b/docsite/latest/rst/playbooks2.rst @@ -273,7 +273,7 @@ Conditional Execution ````````````````````` (Note: this section covers 1.2 conditionals, if you are using a previous version, select -the previous version of the documentation, `Ansible 1.1 Docs `_ . +the previous version of the documentation, `Ansible 1.1 Docs `_ . Those conditional forms continue to be operational in 1.2, although the new mechanisms are cleaner.) Sometimes you will want to skip a particular step on a particular host. This could be something @@ -972,7 +972,7 @@ feature produces a large amount of output, it is best used when checking a singl Dictionary & Nested (Complex) Arguments ``````````````````````````````````````` -As a review, most tasks in ansbile are of this form:: +As a review, most tasks in ansible are of this form:: tasks: diff --git a/hacking/README.md b/hacking/README.md index 9656e722199..b068a98254b 100644 --- a/hacking/README.md +++ b/hacking/README.md @@ -19,7 +19,7 @@ can install them from pip $ easy_install pip # if pip is not already available $ pip install pyyaml jinja2 -From there, follow ansible instructions on ansible.cc/docs as normal. +From there, follow ansible instructions on ansibleworks.com/docs as normal. Test-module ----------- diff --git a/library/internal/async_status b/library/internal/async_status index d24d6f33833..865286dd34b 100644 --- a/library/internal/async_status +++ b/library/internal/async_status @@ -25,7 +25,7 @@ module: async_status short_description: Obtain status of asynchronous task description: - "This module gets the status of an asynchronous task. See: - U(http://ansible.cc/docs/playbooks2.html#asynchronous-actions-and-polling)" + U(http://www.ansibleworks.com/docs/playbooks2.html#asynchronous-actions-and-polling)" version_added: "0.5" options: jid: @@ -42,7 +42,7 @@ options: choices: [ "status", "cleanup" ] default: "status" notes: - - See U(http://ansible.cc/docs/playbooks2.html#asynchronous-actions-and-polling) + - See U(http://www.ansibleworks.com/docs/playbooks2.html#asynchronous-actions-and-polling) requirements: [] author: Michael DeHaan ''' diff --git a/library/network/get_url b/library/network/get_url index 53b07261479..cab322747f6 100644 --- a/library/network/get_url +++ b/library/network/get_url @@ -35,7 +35,7 @@ description: the target host, requests will be sent through that proxy. This behaviour can be overridden by setting a variable for this task (see `setting the environment - `_), + `_), or by using the use_proxy option. version_added: "0.6" options: diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 3346b4940bf..fd2dc0e22b4 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -8,7 +8,7 @@ pkgver(){ pkgrel=1 pkgdesc="A radically simple deployment, model-driven configuration management, and command execution framework" arch=('any') -url="http://ansible.cc" +url="http://www.ansibleworks.com" license=('GPL3') depends=('python2' 'python2-paramiko' 'python2-jinja' 'python2-yaml') makedepends=('git' 'asciidoc' 'fakeroot') diff --git a/packaging/port/sysutils/ansible/Makefile b/packaging/port/sysutils/ansible/Makefile index 61fa94ea734..f5b32b7548f 100644 --- a/packaging/port/sysutils/ansible/Makefile +++ b/packaging/port/sysutils/ansible/Makefile @@ -4,7 +4,7 @@ PORTNAME= ansible PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= python net-mgmt -MASTER_SITES= http://ansible.cc/releases/ +MASTER_SITES= http://ansibleworks.com/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= briancoca+ansible@gmail.com diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 720796e2636..1110304c0ef 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -10,8 +10,8 @@ Version: 1.3 Group: Development/Libraries License: GPLv3 -Source0: http://ansible.cc/releases/%{name}-%{version}.tar.gz -Url: http://ansible.cc +Source0: http://www.ansibleworks.com/releases/%{name}-%{version}.tar.gz +Url: http://www.ansibleworks.com BuildArch: noarch %if 0%{?rhel} && 0%{?rhel} <= 5