Merge pull request #293 from puppetlabs/remove_use_of_puppetlabs.com

(maint) Use puppet.com instead of puppetlabs.com for release packages.
puppetlabs · May 12, 2023 · bb7173c · bb7173c
2 parents b014a51 + 452035a
commit bb7173c
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 62 deletions.
diff --git a/ci/create-packages b/ci/create-packages
@@ -191,10 +191,10 @@ function create_build_directory {
     puppet*-release)
       case $package_type in
         rpm|sles)
-          template_source_directory=yum.puppetlabs.com
+          template_source_directory=yum.puppet.com
           ;;
         deb)
-          template_source_directory=apt.puppetlabs.com
+          template_source_directory=apt.puppet.com
           ;;
       esac
       ;;

diff --git a/doc/README-apt.txt b/doc/README-apt.txt
@@ -15,7 +15,7 @@ PuppetDB, etc.
 To add the repo to a distribution, install the release package with the
 codename for the distribution. For example, on xenial:
 
-wget http://apt.puppetlabs.com/puppet-release-xenial.deb
+wget http://apt.puppet.com/puppet-release-xenial.deb
 sudo dpkg -i puppet-release-xenial.deb
 sudo apt-get update
 
@@ -29,7 +29,7 @@ aws s3 sync --exclude '*.html' s3://apt.puppetlabs.com /var/apt
 rsync -a rsync://rsync.puppet.com/packages/apt /var/apt
 
 # HTTPS via CloudFront (fastest outside of US):
-wget -r https://apt.puppetlabs.com
+wget -r https://apt.puppet.com
 
 
 ## Nightlies

diff --git a/doc/README-yum.txt b/doc/README-yum.txt
@@ -15,7 +15,7 @@ PuppetDB, etc.
 To add the repo to a distribution, install the release package with the
 version for the distribution. For example, on centos 7:
 
-sudo rpm -Uvh https://yum.puppetlabs.com/puppet-release-el-7.noarch.rpm
+sudo rpm -Uvh https://yum.puppet.com/puppet-release-el-7.noarch.rpm
 
 
 ## Recommendations for Mirroring
@@ -27,7 +27,7 @@ aws s3 sync --exclude '*.html' s3://yum.puppetlabs.com /var/yum
 rsync -a rsync://rsync.puppet.com/packages/yum /var/yum
 
 # HTTPS via CloudFront (fastest outside of US):
-wget -r https://yum.puppetlabs.com
+wget -r https://yum.puppet.com
 
 
 ## Nightlies

diff --git a/source/apt.puppet.com/puppet-release.list.template b/source/apt.puppet.com/puppet-release.list.template
@@ -0,0 +1,2 @@
+# Puppet __CODENAME__ Repository
+deb http://apt.puppet.com __CODENAME__ puppet
diff --git a/...bs.com/puppet-tools-release.list.template → ...et.com/puppet-tools-release.list.template b/...bs.com/puppet-tools-release.list.template → ...et.com/puppet-tools-release.list.template
diff --git a/source/apt.puppet.com/puppet7-release.list.template b/source/apt.puppet.com/puppet7-release.list.template
@@ -0,0 +1,2 @@
+# Puppet 7 __CODENAME__ Repository
+deb http://apt.puppet.com __CODENAME__ puppet7
diff --git a/source/apt.puppet.com/puppet8-release.list.template b/source/apt.puppet.com/puppet8-release.list.template
@@ -0,0 +1,2 @@
+# Puppet 8 __CODENAME__ Repository
+deb http://apt.puppet.com __CODENAME__ puppet8
diff --git a/source/apt.puppetlabs.com/puppet-release.list.template b/source/apt.puppetlabs.com/puppet-release.list.template
diff --git a/source/apt.puppetlabs.com/puppet5.list.template b/source/apt.puppetlabs.com/puppet5.list.template
diff --git a/source/apt.puppetlabs.com/puppet7-release.list.template b/source/apt.puppetlabs.com/puppet7-release.list.template
diff --git a/source/apt.puppetlabs.com/puppet8-release.list.template b/source/apt.puppetlabs.com/puppet8-release.list.template
diff --git a/source/projects/puppet-release.json b/source/projects/puppet-release.json
@@ -2,11 +2,11 @@
   "project": "puppet-release",
   "description": "Release packages for the Puppet repository",
   "version": "1.0.0",
-  "release": "26",
+  "release": "27",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <[email protected]>",
-  "homepage": "https://www.puppetlabs.com",
+  "homepage": "https://www.puppet.com",
   "target_repo": "puppet",
 
   "debs": [

diff --git a/source/projects/puppet7-release.json b/source/projects/puppet7-release.json
@@ -2,11 +2,11 @@
   "project": "puppet7-release",
   "description": "Release packages for the Puppet 7 repository",
   "version": "7.0.0",
-  "release": "12",
+  "release": "13",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <[email protected]>",
-  "homepage": "https://www.puppetlabs.com",
+  "homepage": "https://www.puppet.com",
   "target_repo": "puppet7",
 
   "debs": [

diff --git a/source/projects/puppet8-release.json b/source/projects/puppet8-release.json
@@ -2,7 +2,7 @@
   "project": "puppet8-release",
   "description": "Release packages for the Puppet 8 repository",
   "version": "1.0.0",
-  "release": "1",
+  "release": "2",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <[email protected]>",

diff --git a/...ppetlabs.com/puppet-release.repo.template → ...m.puppet.com/puppet-release.repo.template b/...ppetlabs.com/puppet-release.repo.template → ...m.puppet.com/puppet-release.repo.template
@@ -1,6 +1,6 @@
 [puppet]
 name=Puppet Repository __OS_NAME__ __OS_VERSION__ - $basearch
-baseurl=http://yum.puppetlabs.com/puppet/__OS_NAME__/__OS_VERSION__/$basearch
+baseurl=http://yum.puppet.com/puppet/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet-release
        file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-release
 enabled=1

diff --git a/...ppetlabs.com/puppet-release.sles.template → ...m.puppet.com/puppet-release.sles.template b/...ppetlabs.com/puppet-release.sles.template → ...m.puppet.com/puppet-release.sles.template
@@ -1,6 +1,6 @@
 [puppet]
 name=Puppet Repository __OS_NAME__ __OS_VERSION__ - $basearch
-baseurl=http://yum.puppetlabs.com/puppet/__OS_NAME__/__OS_VERSION__/$basearch
+baseurl=http://yum.puppet.com/puppet/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet-release
 enabled=1
 gpgcheck=1
diff --git a/...bs.com/puppet-tools-release.repo.template → ...et.com/puppet-tools-release.repo.template b/...bs.com/puppet-tools-release.repo.template → ...et.com/puppet-tools-release.repo.template
diff --git a/...bs.com/puppet-tools-release.sles.template → ...et.com/puppet-tools-release.sles.template b/...bs.com/puppet-tools-release.sles.template → ...et.com/puppet-tools-release.sles.template
diff --git a/...petlabs.com/puppet7-release.repo.template → ....puppet.com/puppet7-release.repo.template b/...petlabs.com/puppet7-release.repo.template → ....puppet.com/puppet7-release.repo.template
@@ -1,6 +1,6 @@
 [puppet7]
 name=Puppet 7 Repository __OS_NAME__ __OS_VERSION__ - $basearch
-baseurl=http://yum.puppetlabs.com/puppet7/__OS_NAME__/__OS_VERSION__/$basearch
+baseurl=http://yum.puppet.com/puppet7/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet7-release
        file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet7-release
 enabled=1

diff --git a/...petlabs.com/puppet7-release.sles.template → ....puppet.com/puppet7-release.sles.template b/...petlabs.com/puppet7-release.sles.template → ....puppet.com/puppet7-release.sles.template
@@ -1,6 +1,6 @@
 [puppet7]
 name=Puppet 7 Repository __OS_NAME__ __OS_VERSION__ - $basearch
-baseurl=http://yum.puppetlabs.com/puppet7/__OS_NAME__/__OS_VERSION__/$basearch
+baseurl=http://yum.puppet.com/puppet7/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet7-release
 enabled=1
 gpgcheck=1
diff --git a/...petlabs.com/puppet8-release.repo.template → ....puppet.com/puppet8-release.repo.template b/...petlabs.com/puppet8-release.repo.template → ....puppet.com/puppet8-release.repo.template
@@ -1,6 +1,6 @@
 [puppet8]
 name=Puppet 8 Repository __OS_NAME__ __OS_VERSION__ - $basearch
-baseurl=http://yum.puppetlabs.com/puppet8/__OS_NAME__/__OS_VERSION__/$basearch
+baseurl=http://yum.puppet.com/puppet8/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet8-release
 enabled=1
 gpgcheck=1
diff --git a/...petlabs.com/puppet8-release.sles.template → ....puppet.com/puppet8-release.sles.template b/...petlabs.com/puppet8-release.sles.template → ....puppet.com/puppet8-release.sles.template
@@ -1,6 +1,6 @@
 [puppet8]
 name=Puppet 8 Repository __OS_NAME__ __OS_VERSION__ - $basearch
-baseurl=http://yum.puppetlabs.com/puppet8/__OS_NAME__/__OS_VERSION__/$basearch
+baseurl=http://yum.puppet.com/puppet8/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet8-release
 enabled=1
 gpgcheck=1
diff --git a/source/yum.puppetlabs.com/puppet5-release.repo.template b/source/yum.puppetlabs.com/puppet5-release.repo.template
diff --git a/source/yum.puppetlabs.com/puppet5-release.sles.template b/source/yum.puppetlabs.com/puppet5-release.sles.template
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Puppet __CODENAME__ Repository
		deb http://apt.puppet.com __CODENAME__ puppet
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Puppet 7 __CODENAME__ Repository
		deb http://apt.puppet.com __CODENAME__ puppet7
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Puppet 8 __CODENAME__ Repository
		deb http://apt.puppet.com __CODENAME__ puppet8