summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcontrib/inventory/cobbler.py6
-rw-r--r--docs/docsite/rst/user_guide/intro_dynamic_inventory.rst4
-rw-r--r--lib/ansible/modules/cloud/webfaction/webfaction_app.py8
-rw-r--r--lib/ansible/modules/cloud/webfaction/webfaction_db.py4
-rw-r--r--lib/ansible/modules/cloud/webfaction/webfaction_domain.py4
-rw-r--r--lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py4
-rw-r--r--lib/ansible/modules/cloud/webfaction/webfaction_site.py4
-rw-r--r--lib/ansible/modules/packaging/language/pear.py2
-rw-r--r--lib/ansible/modules/packaging/os/apk.py2
-rw-r--r--lib/ansible/modules/packaging/os/pacman.py2
-rw-r--r--lib/ansible/modules/packaging/os/pkgng.py2
-rw-r--r--lib/ansible/modules/packaging/os/slackpkg.py2
-rw-r--r--lib/ansible/plugins/callback/profile_roles.py2
-rw-r--r--lib/ansible/plugins/callback/profile_tasks.py2
-rw-r--r--lib/ansible/plugins/inventory/__init__.py4
-rw-r--r--packaging/debian/control2
-rw-r--r--packaging/port/sysutils/ansible/pkg-descr2
17 files changed, 27 insertions, 29 deletions
diff --git a/contrib/inventory/cobbler.py b/contrib/inventory/cobbler.py
index 0443bb3c8c..2546da0526 100755
--- a/contrib/inventory/cobbler.py
+++ b/contrib/inventory/cobbler.py
@@ -13,7 +13,7 @@ This, more or less, allows you to keep one central database containing
info about all of your managed instances.
This script is an example of sourcing that data from Cobbler
-(http://cobbler.github.com). With cobbler each --mgmt-class in cobbler
+(https://cobbler.github.io). With cobbler each --mgmt-class in cobbler
will correspond to a group in Ansible, and --ks-meta variables will be
passed down for use in templates or even in argument lines.
@@ -25,8 +25,6 @@ ansible talking to it twice. The first one found will be used. If no
not add cobbler system names because there is no requirement in cobbler
that those correspond to addresses.
-See http://ansible.github.com/api.html for more info
-
Tested with Cobbler 2.0.11.
Changelog:
@@ -56,7 +54,7 @@ Changelog:
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
+# along with Ansible. If not, see <https://www.gnu.org/licenses/>.
######################################################################
diff --git a/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst b/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst
index 08917ed2d8..287f4b42e8 100644
--- a/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst
+++ b/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst
@@ -10,7 +10,7 @@ Often a user of a configuration management system will want to keep inventory
in a different software system. Ansible provides a basic text-based system as described in
:ref:`inventory` but what if you want to use something else?
-Frequent examples include pulling inventory from a cloud provider, LDAP, `Cobbler <http://cobbler.github.com>`_,
+Frequent examples include pulling inventory from a cloud provider, LDAP, `Cobbler <https://cobbler.github.io>`_,
or a piece of expensive enterprisey CMDB software.
Ansible easily supports all of these options via an external inventory system. The contrib/inventory directory contains some of these already -- including options for EC2/Eucalyptus, Rackspace Cloud, and OpenStack, examples of some of which will be detailed below.
@@ -25,7 +25,7 @@ For information about writing your own dynamic inventory source, see :ref:`devel
Example: The Cobbler External Inventory Script
``````````````````````````````````````````````
-It is expected that many Ansible users with a reasonable amount of physical hardware may also be `Cobbler <http://cobbler.github.com>`_ users. (note: Cobbler was originally written by Michael DeHaan and is now led by James Cammarata, who also works for Ansible, Inc).
+It is expected that many Ansible users with a reasonable amount of physical hardware may also be `Cobbler <https://cobbler.github.io>`_ users. (note: Cobbler was originally written by Michael DeHaan and is now led by James Cammarata, who also works for Ansible, Inc).
While primarily used to kickoff OS installations and manage DHCP and DNS, Cobbler has a generic
layer that allows it to represent data for multiple configuration management systems (even at the same time), and has
diff --git a/lib/ansible/modules/cloud/webfaction/webfaction_app.py b/lib/ansible/modules/cloud/webfaction/webfaction_app.py
index f32d34b1ed..b1629e7d45 100644
--- a/lib/ansible/modules/cloud/webfaction/webfaction_app.py
+++ b/lib/ansible/modules/cloud/webfaction/webfaction_app.py
@@ -9,7 +9,7 @@
# Create a Webfaction application using Ansible and the Webfaction API
#
# Valid application types can be found by looking here:
-# http://docs.webfaction.com/xmlrpc-api/apps.html#application-types
+# https://docs.webfaction.com/xmlrpc-api/apps.html#application-types
from __future__ import absolute_import, division, print_function
__metaclass__ = type
@@ -25,7 +25,7 @@ DOCUMENTATION = '''
module: webfaction_app
short_description: Add or remove applications on a Webfaction host
description:
- - Add or remove applications on a Webfaction host. Further documentation at U(http://github.com/quentinsf/ansible-webfaction).
+ - Add or remove applications on a Webfaction host. Further documentation at U(https://github.com/quentinsf/ansible-webfaction).
author: Quentin Stafford-Fraser (@quentinsf)
version_added: "2.0"
notes:
@@ -33,7 +33,7 @@ notes:
You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API.
The location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as
your host, you may want to add C(serial: 1) to the plays.
- - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+ - See `the webfaction API <https://docs.webfaction.com/xmlrpc-api/>`_ for more info.
options:
name:
@@ -49,7 +49,7 @@ options:
type:
description:
- - The type of application to create. See the Webfaction docs at U(http://docs.webfaction.com/xmlrpc-api/apps.html) for a list.
+ - The type of application to create. See the Webfaction docs at U(https://docs.webfaction.com/xmlrpc-api/apps.html) for a list.
required: true
autostart:
diff --git a/lib/ansible/modules/cloud/webfaction/webfaction_db.py b/lib/ansible/modules/cloud/webfaction/webfaction_db.py
index 332ee27dd9..2951739b1d 100644
--- a/lib/ansible/modules/cloud/webfaction/webfaction_db.py
+++ b/lib/ansible/modules/cloud/webfaction/webfaction_db.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
module: webfaction_db
short_description: Add or remove a database on Webfaction
description:
- - Add or remove a database on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+ - Add or remove a database on a Webfaction host. Further documentation at https://github.com/quentinsf/ansible-webfaction.
author: Quentin Stafford-Fraser (@quentinsf)
version_added: "2.0"
notes:
@@ -30,7 +30,7 @@ notes:
You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API.
The location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as
your host, you may want to add C(serial: 1) to the plays.
- - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+ - See `the webfaction API <https://docs.webfaction.com/xmlrpc-api/>`_ for more info.
options:
name:
diff --git a/lib/ansible/modules/cloud/webfaction/webfaction_domain.py b/lib/ansible/modules/cloud/webfaction/webfaction_domain.py
index 473caf47d8..3bea294337 100644
--- a/lib/ansible/modules/cloud/webfaction/webfaction_domain.py
+++ b/lib/ansible/modules/cloud/webfaction/webfaction_domain.py
@@ -19,7 +19,7 @@ DOCUMENTATION = '''
module: webfaction_domain
short_description: Add or remove domains and subdomains on Webfaction
description:
- - Add or remove domains or subdomains on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+ - Add or remove domains or subdomains on a Webfaction host. Further documentation at https://github.com/quentinsf/ansible-webfaction.
author: Quentin Stafford-Fraser (@quentinsf)
version_added: "2.0"
notes:
@@ -29,7 +29,7 @@ notes:
You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API.
The location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as
your host, you may want to add C(serial: 1) to the plays.
- - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+ - See `the webfaction API <https://docs.webfaction.com/xmlrpc-api/>`_ for more info.
options:
diff --git a/lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py b/lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py
index afa7020cf9..73a94fe24f 100644
--- a/lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py
+++ b/lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py
@@ -19,7 +19,7 @@ DOCUMENTATION = '''
module: webfaction_mailbox
short_description: Add or remove mailboxes on Webfaction
description:
- - Add or remove mailboxes on a Webfaction account. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+ - Add or remove mailboxes on a Webfaction account. Further documentation at https://github.com/quentinsf/ansible-webfaction.
author: Quentin Stafford-Fraser (@quentinsf)
version_added: "2.0"
notes:
@@ -27,7 +27,7 @@ notes:
You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API.
The location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as
your host, you may want to add C(serial: 1) to the plays.
- - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+ - See `the webfaction API <https://docs.webfaction.com/xmlrpc-api/>`_ for more info.
options:
mailbox_name:
diff --git a/lib/ansible/modules/cloud/webfaction/webfaction_site.py b/lib/ansible/modules/cloud/webfaction/webfaction_site.py
index 578668c566..763b61316e 100644
--- a/lib/ansible/modules/cloud/webfaction/webfaction_site.py
+++ b/lib/ansible/modules/cloud/webfaction/webfaction_site.py
@@ -18,7 +18,7 @@ DOCUMENTATION = '''
module: webfaction_site
short_description: Add or remove a website on a Webfaction host
description:
- - Add or remove a website on a Webfaction host. Further documentation at http://github.com/quentinsf/ansible-webfaction.
+ - Add or remove a website on a Webfaction host. Further documentation at https://github.com/quentinsf/ansible-webfaction.
author: Quentin Stafford-Fraser (@quentinsf)
version_added: "2.0"
notes:
@@ -29,7 +29,7 @@ notes:
You can run playbooks that use this on a local machine, or on a Webfaction host, or elsewhere, since the scripts use the remote webfaction API.
The location is not important. However, running them on multiple hosts I(simultaneously) is best avoided. If you don't specify I(localhost) as
your host, you may want to add C(serial: 1) to the plays.
- - See `the webfaction API <http://docs.webfaction.com/xmlrpc-api/>`_ for more info.
+ - See `the webfaction API <https://docs.webfaction.com/xmlrpc-api/>`_ for more info.
options:
diff --git a/lib/ansible/modules/packaging/language/pear.py b/lib/ansible/modules/packaging/language/pear.py
index 0abc3aa1ac..a284f3d314 100644
--- a/lib/ansible/modules/packaging/language/pear.py
+++ b/lib/ansible/modules/packaging/language/pear.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# (c) 2012, Afterburn <http://github.com/afterburn>
+# (c) 2012, Afterburn <https://github.com/afterburn>
# (c) 2013, Aaron Bull Schaefer <aaron@elasticdog.com>
# (c) 2015, Jonathan Lestrelin <jonathan.lestrelin@gmail.com>
#
diff --git a/lib/ansible/modules/packaging/os/apk.py b/lib/ansible/modules/packaging/os/apk.py
index 4b57e050cc..bace046850 100644
--- a/lib/ansible/modules/packaging/os/apk.py
+++ b/lib/ansible/modules/packaging/os/apk.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
# (c) 2015, Kevin Brebanov <https://github.com/kbrebanov>
-# Based on pacman (Afterburn <http://github.com/afterburn>, Aaron Bull Schaefer <aaron@elasticdog.com>)
+# Based on pacman (Afterburn <https://github.com/afterburn>, Aaron Bull Schaefer <aaron@elasticdog.com>)
# and apt (Matthew Williams <matthew@flowroute.com>) modules.
#
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/lib/ansible/modules/packaging/os/pacman.py b/lib/ansible/modules/packaging/os/pacman.py
index 823b0abea1..54e7cffa1a 100644
--- a/lib/ansible/modules/packaging/os/pacman.py
+++ b/lib/ansible/modules/packaging/os/pacman.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright: (c) 2012, Afterburn <http://github.com/afterburn>
+# Copyright: (c) 2012, Afterburn <https://github.com/afterburn>
# Copyright: (c) 2013, Aaron Bull Schaefer <aaron@elasticdog.com>
# Copyright: (c) 2015, Indrajit Raychaudhuri <irc+code@indrajit.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/lib/ansible/modules/packaging/os/pkgng.py b/lib/ansible/modules/packaging/os/pkgng.py
index d921962b3a..9d90c06954 100644
--- a/lib/ansible/modules/packaging/os/pkgng.py
+++ b/lib/ansible/modules/packaging/os/pkgng.py
@@ -4,7 +4,7 @@
# (c) 2013, bleader
# Written by bleader <bleader@ratonland.org>
# Based on pkgin module written by Shaun Zinck <shaun.zinck at gmail.com>
-# that was based on pacman module written by Afterburn <http://github.com/afterburn>
+# that was based on pacman module written by Afterburn <https://github.com/afterburn>
# that was based on apt module written by Matthew Williams <matthew@flowroute.com>
#
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/lib/ansible/modules/packaging/os/slackpkg.py b/lib/ansible/modules/packaging/os/slackpkg.py
index 5d27544d8b..404e6ab1fe 100644
--- a/lib/ansible/modules/packaging/os/slackpkg.py
+++ b/lib/ansible/modules/packaging/os/slackpkg.py
@@ -5,7 +5,7 @@
# Written by Kim Nørgaard <jasen@jasen.dk>
# Based on pkgng module written by bleader <bleader@ratonland.org>
# that was based on pkgin module written by Shaun Zinck <shaun.zinck at gmail.com>
-# that was based on pacman module written by Afterburn <http://github.com/afterburn>
+# that was based on pacman module written by Afterburn <https://github.com/afterburn>
# that was based on apt module written by Matthew Williams <matthew@flowroute.com>
#
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/lib/ansible/plugins/callback/profile_roles.py b/lib/ansible/plugins/callback/profile_roles.py
index e13cb29fc5..e2bbf026f6 100644
--- a/lib/ansible/plugins/callback/profile_roles.py
+++ b/lib/ansible/plugins/callback/profile_roles.py
@@ -1,4 +1,4 @@
-# (c) 2017, Tennis Smith, http://github.com/gamename
+# (c) 2017, Tennis Smith, https://github.com/gamename
# (c) 2017 Ansible Project
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/lib/ansible/plugins/callback/profile_tasks.py b/lib/ansible/plugins/callback/profile_tasks.py
index 6603293c3b..dd6e45aae5 100644
--- a/lib/ansible/plugins/callback/profile_tasks.py
+++ b/lib/ansible/plugins/callback/profile_tasks.py
@@ -1,4 +1,4 @@
-# (C) 2016, Joel, http://github.com/jjshoe
+# (C) 2016, Joel, https://github.com/jjshoe
# (C) 2015, Tom Paine, <github@aioue.net>
# (C) 2014, Jharrod LaFon, @JharrodLaFon
# (C) 2012-2013, Michael DeHaan, <michael.dehaan@gmail.com>
diff --git a/lib/ansible/plugins/inventory/__init__.py b/lib/ansible/plugins/inventory/__init__.py
index 1488b99ae0..3c929bb4fd 100644
--- a/lib/ansible/plugins/inventory/__init__.py
+++ b/lib/ansible/plugins/inventory/__init__.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
+# along with Ansible. If not, see <https://www.gnu.org/licenses/>.
# Make coding more python3-ish
from __future__ import (absolute_import, division, print_function)
@@ -69,7 +69,7 @@ def expand_hostname_range(line=None):
appearance. They are replaced in this function with '|' to ease
string splitting.
- References: http://ansible.github.com/patterns.html#hosts-and-groups
+ References: https://docs.ansible.com/ansible/latest/user_guide/intro_inventory.html#hosts-and-groups
'''
all_hosts = []
if line:
diff --git a/packaging/debian/control b/packaging/debian/control
index ed277b8a0d..88ead3bdf9 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Standards-Version: 3.9.3
Maintainer: Ansible, Inc. <info@ansible.com>
Build-Depends: cdbs, debhelper (>= 5.0.0), python-docutils, python, dh-python | python-support, python-setuptools, lsb-release
-Homepage: http://ansible.github.com/
+Homepage: https://github.com/ansible/ansible/
Package: ansible
Architecture: all
diff --git a/packaging/port/sysutils/ansible/pkg-descr b/packaging/port/sysutils/ansible/pkg-descr
index 3c377016f4..0bf68cd71d 100644
--- a/packaging/port/sysutils/ansible/pkg-descr
+++ b/packaging/port/sysutils/ansible/pkg-descr
@@ -1,4 +1,4 @@
Ansible is a radically simple model-driven configuration management, deployment, and command execution framework.
Author: Michael DeHaan
-WWW: http://ansible.github.com/
+WWW: https://github.com/ansible/ansible/
View Lorry Controller Status