From 8ba7573f1574dd177c3723018febe07a85a58aee Mon Sep 17 00:00:00 2001 From: Till Maas Date: Dec 18 2016 10:28:33 +0000 Subject: [PATCH 1/3] Use https to link to wiki --- diff --git a/util/koji-gc b/util/koji-gc index b43f8aa..710ba21 100755 --- a/util/koji-gc +++ b/util/koji-gc @@ -381,7 +381,7 @@ At the end of that period they will be deleted permanently. This garbage collection is a normal part of build system operation. Please see the following url for more information: - http://fedoraproject.org/wiki/Koji/GarbageCollection""" + https://fedoraproject.org/wiki/Koji/GarbageCollection""" fmt="""\ Build: %%(name)s-%%(version)s-%%(release)s %s/buildinfo?buildID=%%(id)i""" % options.weburl From c8c23bb6717792e2dd2651ae52be924c030ee622 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Dec 19 2016 09:38:01 +0000 Subject: [PATCH 2/3] Update http:// to https:// in docs Where site is running https, URL was updated. --- diff --git a/README.md b/README.md index 49e7f75..c264282 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ koji - RPM building and tracking system ======================================= -Koji is an RPM-based build system. The Fedora Project uses Koji for [their build system](http://koji.fedoraproject.org/koji/), as do [several other projects](https://fedoraproject.org/wiki/Koji/RunsHere). +Koji is an RPM-based build system. The Fedora Project uses Koji for [their build system](https://koji.fedoraproject.org/koji/), as do [several other projects](https://fedoraproject.org/wiki/Koji/RunsHere). Koji's goal is to provide a flexible, secure, and reproducible way to build software. diff --git a/docs/source/external_repo_server_bootstrap.rst b/docs/source/external_repo_server_bootstrap.rst index 488f8ed..192323a 100644 --- a/docs/source/external_repo_server_bootstrap.rst +++ b/docs/source/external_repo_server_bootstrap.rst @@ -93,17 +93,17 @@ Fedora 10 :: - http://mirrors.kernel.org/fedora/releases/10/Everything/\$arch/os/ - http://mirrors.kernel.org/fedora/updates/10/\$arch/ + https://mirrors.kernel.org/fedora/releases/10/Everything/\$arch/os/ + https://mirrors.kernel.org/fedora/updates/10/\$arch/ CentOS 5 and EPEL ----------------- :: - http://mirrors.kernel.org/centos/5/os/\$arch/ - http://mirrors.kernel.org/centos/5/updates/\$arch/ - http://mirrors.kernel.org/fedora-epel/5/\$arch/ + https://mirrors.kernel.org/centos/5/os/\$arch/ + https://mirrors.kernel.org/centos/5/updates/\$arch/ + https://mirrors.kernel.org/fedora-epel/5/\$arch/ Example tags and targets ======================== diff --git a/docs/source/image_build.rst b/docs/source/image_build.rst index 1866f8a..b2bb0dc 100644 --- a/docs/source/image_build.rst +++ b/docs/source/image_build.rst @@ -283,7 +283,7 @@ building a disk image. :: - $ koji image-build --repo 'http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' --kickstart fedora-server.ks --scratch --distro Fedora-22 --format qcow2 fedora-server-kvm 22 'http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' x86_64 + $ koji image-build --repo 'https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' --kickstart fedora-server.ks --scratch --distro Fedora-22 --format qcow2 fedora-server-kvm 22 'https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' x86_64 This example builds a scratch qcow2 disk image using packages from an additional yum repository. Without this option the yum repo to populate the @@ -349,12 +349,12 @@ could look like: name = fedora-server-docker version = 22 target = f22-candidate - install_tree = http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/ + install_tree = https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/ arches = x86_64 format = qcow2,rhevm-ova,vsphere-ova distro = Fedora-22 - repo = http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/ + repo = https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/ disk_size = 20 ksversion = DEVEL @@ -554,7 +554,7 @@ installation locally using something like Gnome's Virtual Machine Manager * Select a Network Install * For the Operating System Install URL use the same one you gave to Koji. It will be something like - http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/x86_64/os/ + https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/x86_64/os/ * Set the Kickstart URL to where your kickstart file is. You may need to make it available over http. * Bump the memory to 2048M for good measure @@ -739,7 +739,7 @@ section instead. 22 x86_64 - http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/x86_64/os/ + https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/x86_64/os/ rpm -qa --qf '%{NAME},%{VERSION},%{RELEASE},%{ARCH},%{EPOCH},%{SIZE},%{SIGMD5},%{BUILDTIME}\n' @@ -789,7 +789,7 @@ Koji Preparation koji add-tag jay-fedora22-candidate --parent jay-fedora22 koji add-tag-inheritance --priority 40 jay-fedora22-build fedora22 koji add-pkg --owner kojiadmin jay-fedora22 fedora-server-ec2 fedora-server-kvm - koji add-external-repo -t fedora::20 fedora22 'http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' + koji add-external-repo -t fedora::20 fedora22 'https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' koji add-target jay-fedora22-candidate jay-fedora22-build koji regen-repo jay-fedora22-build #. Grab a kickstart file from an image task in Koji that relates to what you want to test. @@ -797,7 +797,7 @@ Koji Preparation :: - koji image-build fedora-server-ec2 22 --distro Fedora-22 jay-fedora22-candidate --kickstart fedora-server-starter-ec2.ks 'http://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' + koji image-build fedora-server-ec2 22 --distro Fedora-22 jay-fedora22-candidate --kickstart fedora-server-starter-ec2.ks 'https://alt.fedoraproject.org/pub/alt/releases/22/Cloud/$arch/os/' Building Appliances @@ -937,7 +937,7 @@ to be. .. _livecd-tools: https://github.com/rhinstaller/livecd-tools/ .. _livecd-creator: https://fedoraproject.org/wiki/FedoraLiveCD .. _ImageFactory: http://imgfac.org/ -.. _Oz: http://github.com/clalancette/oz +.. _Oz: https://github.com/clalancette/oz .. _how to use Oz: https://github.com/clalancette/oz/wiki .. _how to use ImageFactory: http://imgfac.org/documentation/ -.. _appliance-creator: http://fedoraproject.org/wiki/Features/ApplianceTools +.. _appliance-creator: https://fedoraproject.org/wiki/Features/ApplianceTools diff --git a/docs/source/index.rst b/docs/source/index.rst index 4f6ab73..6de3165 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -274,6 +274,6 @@ Indices and tables * :ref:`modindex` * :ref:`search` -.. _Mock: http://fedoraproject.org/wiki/Projects/Mock -.. _RPM packages for the Fedora project: http://koji.fedoraproject.org/koji/ +.. _Mock: https://fedoraproject.org/wiki/Projects/Mock +.. _RPM packages for the Fedora project: https://koji.fedoraproject.org/koji/ .. _Koji project website: https://fedorahosted.org/koji/wiki diff --git a/docs/source/misc.rst b/docs/source/misc.rst index bdb1ea3..b78a0aa 100644 --- a/docs/source/misc.rst +++ b/docs/source/misc.rst @@ -186,6 +186,6 @@ dist-build tag For packages that incorporate the %dist tags in their filename, they expect %dist to be defined in /etc/rpm/macros.dist, which was added in Fedora 7. For building on RHEL5/FC6 and earlier, koji needs the -`http://buildsys.fedoraproject.org/buildgroups/ -buildsys-macros `__ +`https://buildsys.fedoraproject.org/buildgroups/ +buildsys-macros `__ package tagged under the dist-build tag. diff --git a/docs/source/server_bootstrap.rst b/docs/source/server_bootstrap.rst index 86c3588..05efe95 100644 --- a/docs/source/server_bootstrap.rst +++ b/docs/source/server_bootstrap.rst @@ -76,7 +76,7 @@ amount of time, especially when tagging a large number of packages. the minimal buildroot You can find out what the current build group for Fedora is by running -``koji -s http://$ARCH.koji.fedoraproject.org/kojihub list-groups f17-build`` +``koji -s https://$ARCH.koji.fedoraproject.org/kojihub list-groups f17-build`` against the Fedora Koji instance for your $ARCH. This is probably a good starting point for your minimal buildroot. diff --git a/docs/source/using_the_koji_build_system.rst b/docs/source/using_the_koji_build_system.rst index ebf7aa2..97bc2db 100644 --- a/docs/source/using_the_koji_build_system.rst +++ b/docs/source/using_the_koji_build_system.rst @@ -103,7 +103,7 @@ The web interface next section if you like.}} The primary interface for viewing Koji data is a web application. It is -available at http://koji.fedoraproject.org/koji/ . Most of the interface +available at https://koji.fedoraproject.org/koji/ . Most of the interface is read-only, but with sufficient privileges, you can log in and perform some additional actions. For example: @@ -382,9 +382,9 @@ for example to get the latest buildroot for dist-f12-build run :: - koji mock-config --tag dist-f12-build --arch=x86_64 --topurl=http://kojipkgs.fedoraproject.org/ dist-f12 + koji mock-config --tag dist-f12-build --arch=x86_64 --topurl=https://kojipkgs.fedoraproject.org/ dist-f12 -you will need to pass in --topurl=http://kojipkgs.fedoraproject.org/ to +you will need to pass in --topurl=https://kojipkgs.fedoraproject.org/ to any mock-config command to get a working mock-config from fedoras koji. Using Koji to control tasks diff --git a/docs/source/writing_koji_code.rst b/docs/source/writing_koji_code.rst index 99f8518..64bda4b 100644 --- a/docs/source/writing_koji_code.rst +++ b/docs/source/writing_koji_code.rst @@ -102,20 +102,20 @@ file had this: [Fedora] authtype = ssl - server = http://koji.fedoraproject.org/kojihub + server = https://koji.fedoraproject.org/kojihub topdir = /mnt/koji - weburl = http://koji.fedoraproject.org/koji - #pkgurl = http://koji.fedoraproject.org/packages + weburl = https://koji.fedoraproject.org/koji + #pkgurl = https://koji.fedoraproject.org/packages cert = ~/.fedora.cert ca = ~/.fedora-upload-ca.cert serverca = ~/.fedora-server-ca.cert [MyKoji] - server = http://koji.mydomain.com/kojihub + server = https://koji.mydomain.com/kojihub authtype = kerberos topdir = /mnt/koji - weburl = http://koji.mydomain.com/koji - topurl = http://download.mydomain.com/kojifiles + weburl = https://koji.mydomain.com/koji + topurl = https://download.mydomain.com/kojifiles you could pass Fedora or MyKoji to --profile. From a0db108a73987712c77f824a3f60e8f163afda82 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Dec 19 2016 09:38:51 +0000 Subject: [PATCH 3/3] Update http:// to https:// in code Where https is working, code was updated to use it. --- diff --git a/hub/hub.conf b/hub/hub.conf index f1e40c1..8b5dd55 100644 --- a/hub/hub.conf +++ b/hub/hub.conf @@ -1,7 +1,7 @@ [hub] ## ConfigParser style config file, similar to ini files -## http://docs.python.org/library/configparser.html +## https://docs.python.org/library/configparser.html ## ## Note that multiline values can be set by indenting subsequent lines ## (which means you should not indent regular lines) diff --git a/koji.spec b/koji.spec index 004d626..ea665a3 100644 --- a/koji.spec +++ b/koji.spec @@ -21,7 +21,7 @@ License: LGPLv2 and GPLv2+ # koji.ssl libs (from plague) are GPLv2+ Summary: Build system tools Group: Applications/System -URL: http://fedorahosted.org/koji +URL: https://pagure.io/koji Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch diff --git a/koji/daemon.py b/koji/daemon.py index 5c38814..8f7ed0d 100644 --- a/koji/daemon.py +++ b/koji/daemon.py @@ -1028,7 +1028,7 @@ class TaskManager(object): # df -iP path ? # memory (meminfo/vmstat) # vmstat fields 3-6 (also 7-8 for swap) - # http://www.redhat.com/advice/tips/meminfo.html + # https://www.redhat.com/advice/tips/meminfo.html # cpu cycles (vmstat?) # vmstat fields 13-16 (and others?) # others?: diff --git a/koji/util.py b/koji/util.py index 4d47d55..563703d 100644 --- a/koji/util.py +++ b/koji/util.py @@ -445,7 +445,7 @@ class adler32_constructor(object): def __init__(self, arg=''): self._value = adler32(arg) & 0xffffffffL #the bitwise and works around a bug in some versions of python - #see: http://bugs.python.org/issue1202 + #see: https://bugs.python.org/issue1202 def update(self, arg): self._value = adler32(arg, self._value) & 0xffffffffL diff --git a/tests/test_cli/loadcli.py b/tests/test_cli/loadcli.py index 7d04b41..f9449fc 100644 --- a/tests/test_cli/loadcli.py +++ b/tests/test_cli/loadcli.py @@ -3,7 +3,7 @@ import sys # We have to do this craziness because 'import koji' is ambiguous. Is it the # koji module, or the koji cli module. Jump through hoops accordingly. -# http://stackoverflow.com/questions/67631/how-to-import-a-module-given-the-full-path +# https://stackoverflow.com/questions/67631/how-to-import-a-module-given-the-full-path CLI_FILENAME = os.path.dirname(__file__) + "/../../cli/koji" if sys.version_info[0] >= 3: import importlib.util diff --git a/util/koji-gc.conf b/util/koji-gc.conf index 8a0c07a..dea8880 100644 --- a/util/koji-gc.conf +++ b/util/koji-gc.conf @@ -14,7 +14,7 @@ unprotected_keys = redhat-beta server = https://koji.fedoraproject.org/kojihub -weburl = http://koji.fedoraproject.org/koji +weburl = https://koji.fedoraproject.org/koji # The service name of the principal being used by the hub #krbservice = host diff --git a/util/koji-shadow.conf b/util/koji-shadow.conf index 37318b7..d31080c 100644 --- a/util/koji-shadow.conf +++ b/util/koji-shadow.conf @@ -4,4 +4,4 @@ [main] server=http://localhost/kojihub/ krbservice=host -remote=http://koji.fedoraproject.org/kojihub +remote=https://koji.fedoraproject.org/kojihub