summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorJon Grimm <jon.grimm@canonical.com>2017-04-03 11:52:42 -0500
committerScott Moser <smoser@brickies.net>2017-04-12 12:32:27 -0400
commitaab609104988b9d14572eb8fa1dd28a8156c0aea (patch)
treeb8ecee2208280ba2592d17630aa3e2a7823d15de /cloudinit/distros
parentcd83b77dd1804f90694891470c04514aaa74d18f (diff)
downloadvyos-cloud-init-aab609104988b9d14572eb8fa1dd28a8156c0aea.tar.gz
vyos-cloud-init-aab609104988b9d14572eb8fa1dd28a8156c0aea.zip
Remove (and/or fix) URL shortener references
Several references that were using URL shorteners are now broken due to their service going away, making it painful to even figure out what they were supposed to be pointing at. Put back long URLS using '# noqa' to make flake8 happy. LP: #1669727
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/debian.py3
-rw-r--r--cloudinit/distros/parsers/hosts.py4
-rw-r--r--cloudinit/distros/rhel.py4
3 files changed, 5 insertions, 6 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 3f0f9d53..16f8d955 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -143,8 +143,7 @@ class Distro(distros.Distro):
pkgs = []
e = os.environ.copy()
- # See: http://tiny.cc/kg91fw
- # Or: http://tiny.cc/mh91fw
+ # See: http://manpages.ubuntu.com/manpages/xenial/man7/debconf.7.html
e['DEBIAN_FRONTEND'] = 'noninteractive'
wcfg = self.get_option("apt_get_wrapper", APT_GET_WRAPPER)
diff --git a/cloudinit/distros/parsers/hosts.py b/cloudinit/distros/parsers/hosts.py
index 87f164be..64444581 100644
--- a/cloudinit/distros/parsers/hosts.py
+++ b/cloudinit/distros/parsers/hosts.py
@@ -10,8 +10,8 @@ from cloudinit.distros.parsers import chop_comment
# See: man hosts
-# or http://unixhelp.ed.ac.uk/CGI/man-cgi?hosts
-# or http://tinyurl.com/6lmox3
+# or https://linux.die.net/man/5/hosts
+# or https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/configtuning-configfiles.html # noqa
class HostsConf(object):
def __init__(self, text):
self._text = text
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 372c7d0f..1fecb619 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -28,7 +28,7 @@ def _make_sysconfig_bool(val):
class Distro(distros.Distro):
- # See: http://tiny.cc/6r99fw
+ # See: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Networking_Guide/sec-Network_Configuration_Using_sysconfig_Files.html # noqa
clock_conf_fn = "/etc/sysconfig/clock"
locale_conf_fn = '/etc/sysconfig/i18n'
systemd_locale_conf_fn = '/etc/locale.conf'
@@ -130,8 +130,8 @@ class Distro(distros.Distro):
rhel_util.update_sysconfig_file(out_fn, host_cfg)
def _select_hostname(self, hostname, fqdn):
- # See: http://bit.ly/TwitgL
# Should be fqdn if we can use it
+ # See: https://www.centos.org/docs/5/html/Deployment_Guide-en-US/ch-sysconfig.html#s2-sysconfig-network # noqa
if fqdn:
return fqdn
return hostname