fix(repo): update repo urls to repo.saltproject.io

Use the following command: ``` $ GREP_SED="$repo\.salt$stack\.com" \ && grep -rl --exclude-dir=.git "${GREP_SED}" \ | grep -v .un~$ \ | xargs sed -i -e "/${GREP_SED}/s//\1project.io/g" ```
saltstack-formulas · May 25, 2021 · 80542ba · 80542ba
1 parent 374527b
commit 80542ba
Show file tree

Hide file tree

Showing 52 changed files with 104 additions and 104 deletions.
diff --git a/docs/README.rst b/docs/README.rst
@@ -199,7 +199,7 @@ salt-minion packages on MacOS will not be upgraded by default. To enable package
 
     install_packages: True
     version: 2017.7.4
-    salt_minion_pkg_source: https://repo.saltstack.com/osx/salt-2017.7.4-py3-x86_64.pkg
+    salt_minion_pkg_source: https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg
 
 install_packages must indicate that the installation of a package is desired. If so, version will be used to compare the version of the installed .pkg against the downloaded one. If version is not set and a salt.pkg is already installed the .pkg will not be installed again.
 

diff --git a/pillar.example b/pillar.example
@@ -37,14 +37,14 @@ salt:
     salt_ssh: 'salt-ssh'
     pyinotify: 'python-pyinotify'  # the package to be installed for pyinotify
 
-  # Set which salt repository to use, default to https://repo.saltstack.com
+  # Set which salt repository to use, default to https://repo.saltproject.io
   # For older releases use https://archive.repo.saltproject.io
   repo: 'https://archive.repo.saltproject.io'
 
   # Set which release of SaltStack to use, default to 'latest'
   # To get the available releases:
-  # * http://repo.saltstack.com/yum/redhat/7/x86_64/
-  # * http://repo.saltstack.com/apt/debian/8/amd64/
+  # * http://repo.saltproject.io/yum/redhat/7/x86_64/
+  # * http://repo.saltproject.io/apt/debian/8/amd64/
   release: '2018.3'
 
   # MacOS has no package management.
@@ -57,8 +57,8 @@ salt:
   # NOTE: salt_minion_pkg_hash, if set, will be passed into file.managed's
   # source_hash, use URL or hash string
   # yamllint disable rule:line-length
-  salt_minion_pkg_source: 'https://repo.saltstack.com/osx/salt-2017.7.4-py3-x86_64.pkg'
-  salt_minion_pkg_hash: 'https://repo.saltstack.com/osx/salt-2017.7.4-py3-x86_64.pkg.md5'
+  salt_minion_pkg_source: 'https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg'
+  salt_minion_pkg_hash: 'https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg.md5'
   # yamllint enable rule:line-length
 
   # tofs:

diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
@@ -13,7 +13,7 @@
 {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
 {%- set oscodename = salt['grains.get']('oscodename') %}
 {%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
-{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltstack.com') %}
+{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
 
 #from template-formula
 {%- if grains.os_family == 'MacOS' %}

diff --git a/salt/osmap.yaml b/salt/osmap.yaml
@@ -13,7 +13,7 @@
 {% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
 {% set oscodename = salt['grains.get']('oscodename') %}
 {% set os_family_lower =  salt['grains.get']('os_family')|lower %}
-{% set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltstack.com') %}
+{% set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
 
 Fedora:
   pygit2: python2-pygit2

diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000 xenial main
+    pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/16.04/amd64/3000 xenial main
     py_ver: ''
     pygit2: python-pygit2
     pyinotify: python-pyinotify

diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000 bionic main
+    pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000 bionic main
     py_ver: ''
     pygit2: python-pygit2
     pyinotify: python-pyinotify

diff --git a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/amazon/2/$basearch/3000
+    pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3000
     pkgrepo_humanname: SaltStack repo for Amazon Linux 2
     pkgrepo_name: saltstack-amzn-repo
     py_ver: py3

diff --git a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/py3/debian/10/amd64/3000 buster main
+    pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3000 buster main
     py_ver: py3
     pyinotify: python-pyinotify
     python_dulwich: python-dulwich

diff --git a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/py3/debian/9/amd64/3000 stretch main
+    pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3000 stretch main
     py_ver: py3
     pyinotify: python-pyinotify
     python_dulwich: python-dulwich

diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000 xenial main
+    pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3000 xenial main
     py_ver: py3
     pygit2: python-pygit2
     pyinotify: python-pyinotify

diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000 bionic main
+    pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000 bionic main
     py_ver: py3
     pygit2: python-pygit2
     pyinotify: python-pyinotify

diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/amazon/2/$basearch/3001
+    pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3001
     pkgrepo_humanname: SaltStack repo for Amazon Linux 2
     pkgrepo_name: saltstack-amzn-repo
     py_ver: py3

diff --git a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/py3/debian/10/amd64/3001 buster main
+    pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main
     py_ver: py3
     pyinotify: python-pyinotify
     python_dulwich: python-dulwich

diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.22.1
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub
     libgit2: libgit2-22
     master:
       ext_pillar:
@@ -86,7 +86,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb https://repo.saltstack.com/py3/debian/9/amd64/3001 stretch main
+    pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main
     py_ver: py3
     pyinotify: python-pyinotify
     python_dulwich: python-dulwich

diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3

diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -85,7 +85,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001
     pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
     pkgrepo_name: saltstack
     py_ver: py3