Skip to content

Commit

Permalink
Merge pull request #208 from brianhlin/swear-jar-reduction
Browse files Browse the repository at this point in the history
Update references from repo.opensciencegrid.org -> repo.osg-htc.org
  • Loading branch information
matyasselmeci authored Nov 5, 2024
2 parents 23978df + 5b75c98 commit 32f2e9a
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 28 deletions.
10 changes: 5 additions & 5 deletions docs/common/ca.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ To verify that your CA certificates are on the latest version on a given host, d
versions and the method by which your CA certificates have been installed:

1. Retrieve the versions of the most recently released
[IGTF CA certificates](https://repo.opensciencegrid.org/cadist/index.html) and
[OSG CA certificates](https://repo.opensciencegrid.org/cadist/index-new.html)
[IGTF CA certificates](https://repo.osg-htc.org/cadist/index.html) and
[OSG CA certificates](https://repo.osg-htc.org/cadist/index-new.html)

1. Determine which of the three CA certificate installation methods you are using:

Expand Down Expand Up @@ -257,11 +257,11 @@ Related software:
| Package | File Description | Location | Comment |
|:------------------------------|:----------------------------------------|:--------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------|
| All CA Packages | CA File Location | `/etc/grid-security/certificates` | |
| All CA Packages | Index files | `/etc/grid-security/certificates/INDEX.html` or `/etc/grid-security/certificates/INDEX.txt` | Latest version also available at <http://repo.opensciencegrid.org/cadist/> |
| All CA Packages | Change Log | `/etc/grid-security/certificates/CHANGES` | Latest version also available at <http://repo.opensciencegrid.org/cadist/CHANGES> |
| All CA Packages | Index files | `/etc/grid-security/certificates/INDEX.html` or `/etc/grid-security/certificates/INDEX.txt` | Latest version also available at <http://repo.osg-htc.org/cadist/> |
| All CA Packages | Change Log | `/etc/grid-security/certificates/CHANGES` | Latest version also available at <http://repo.osg-htc.org/cadist/CHANGES> |
| osg-ca-certs or igtf-ca-certs | contain only CA files | | |
| osg-ca-scripts | Configuration File for osg-update-certs | `/etc/osg/osg-update-certs.conf` | This file may be edited by hand, though it is recommended to use osg-ca-manage to set configuration parameters. |
| fetch-crl-3.x | Configuration file | `/etc/fetch-crl.conf` | |
| fetch-crl-3.x | Configuration file | `/etc/fetch-crl.conf` | |

The index and change log files contain a summary of all the CA distributed and their version.

Expand Down
22 changes: 11 additions & 11 deletions docs/common/yum.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ If you are unfamiliar with Yum, see the [documentation on using Yum and RPM](../
Repositories
------------

The OSG hosts multiple repositories at [repo.opensciencegrid.org](https://repo.opensciencegrid.org/osg/) that are
The OSG hosts multiple repositories at [repo.osg-htc.org](https://repo.osg-htc.org/osg/) that are
intended for public use:

| The OSG Yum repositories... | Contain RPMs that... |
Expand Down Expand Up @@ -65,10 +65,10 @@ supported by the OSG.

The definitive list of software in the contrib repository can be found here:

- [OSG 24 EL9 contrib software repository](https://repo.opensciencegrid.org/osg/24-contrib/el9/x86_64/)
- [OSG 24 EL8 contrib software repository](https://repo.opensciencegrid.org/osg/24-contrib/el8/x86_64/)
- [OSG 23 EL9 contrib software repository](https://repo.opensciencegrid.org/osg/23-contrib/el9/x86_64/)
- [OSG 23 EL8 contrib software repository](https://repo.opensciencegrid.org/osg/23-contrib/el8/x86_64/)
- [OSG 24 EL9 contrib software repository](https://repo.osg-htc.org/osg/24-contrib/el9/x86_64/)
- [OSG 24 EL8 contrib software repository](https://repo.osg-htc.org/osg/24-contrib/el8/x86_64/)
- [OSG 23 EL9 contrib software repository](https://repo.osg-htc.org/osg/23-contrib/el9/x86_64/)
- [OSG 23 EL8 contrib software repository](https://repo.osg-htc.org/osg/23-contrib/el8/x86_64/)

If you would like to distribute your software in the OSG `contrib` repository, please [contact us](../common/help.md) with a
description of your software, what users it serves, and relevant RPM packaging.
Expand Down Expand Up @@ -155,22 +155,22 @@ For instructions on upgrading from one OSG series to another, see the
- OSG 24 EL9:

:::console
root@host # yum install https://repo.opensciencegrid.org/osg/24-main/osg-24-main-el9-release-latest.rpm
root@host # yum install https://repo.osg-htc.org/osg/24-main/osg-24-main-el9-release-latest.rpm

- OSG 24 EL8:

:::console
root@host # yum install https://repo.opensciencegrid.org/osg/24-main/osg-24-main-el8-release-latest.rpm
root@host # yum install https://repo.osg-htc.org/osg/24-main/osg-24-main-el8-release-latest.rpm

- OSG 23 EL9:

:::console
root@host # yum install https://repo.opensciencegrid.org/osg/23-main/osg-23-main-el9-release-latest.rpm
root@host # yum install https://repo.osg-htc.org/osg/23-main/osg-23-main-el9-release-latest.rpm

- OSG 23 EL8:

:::console
root@host # yum install https://repo.opensciencegrid.org/osg/23-main/osg-23-main-el8-release-latest.rpm
root@host # yum install https://repo.osg-htc.org/osg/23-main/osg-23-main-el8-release-latest.rpm


1. The only OSG repository enabled by default is the release one.
Expand All @@ -180,8 +180,8 @@ For instructions on upgrading from one OSG series to another, see the
:::file hl_lines="7"
[osg-testing]
name=OSG Software for Enterprise Linux 9 - Testing - $basearch
#baseurl=https://repo.opensciencegrid.org/osg/24-main/el9/testing/$basearch
mirrorlist=https://repo.opensciencegrid.org/osg/24-main/el9/testing/$basearch
#baseurl=https://repo.osg-htc.org/osg/24-main/el9/testing/$basearch
mirrorlist=https://repo.osg-htc.org/osg/24-main/el9/testing/$basearch
failovermethod=priority
priority=98
enabled=1
Expand Down
4 changes: 2 additions & 2 deletions docs/release/signing.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ For example:

```console
# rpm --import https://repo.osg-htc.org/osg/RPM-GPG-KEY-OSG-24-developer
# rpm --checksig -v https://repo.opensciencegrid.org/osg/24-main/osg-24-main-el9-release-latest.rpm
https://repo.opensciencegrid.org/osg/24-main/osg-24-main-el9-release-latest.rpm:
# rpm --checksig -v https://repo.osg-htc.org/osg/24-main/osg-24-main-el9-release-latest.rpm
https://repo.osg-htc.org/osg/24-main/osg-24-main-el9-release-latest.rpm:
Header V4 RSA/SHA256 Signature, key ID effc3be6: OK
Header SHA256 digest: OK
Header SHA1 digest: OK
Expand Down
8 changes: 4 additions & 4 deletions docs/security/certificate-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Here is the resulting file after add
install_dir = /etc/grid-security
## cacerts_url is the URL of your certificate distribution
cacerts_url = https://repo.opensciencegrid.org/cadist/ca-certs-version-igtf-new
cacerts_url = https://repo.osg-htc.org/cadist/ca-certs-version-igtf-new
## log specifies where logging output will go
log = /var/log/osg-update-certs.log
Expand Down Expand Up @@ -267,7 +267,7 @@ The resulting config file after the remove is as follows
install_dir = /etc/grid-security
## cacerts_url is the URL of your certificate distribution
cacerts_url = https://repo.opensciencegrid.org/cadist/ca-certs-version-igtf-new
cacerts_url = https://repo.osg-htc.org/cadist/ca-certs-version-igtf-new
## log specifies where logging output will go
log = /var/log/osg-update-certs.log
Expand Down Expand Up @@ -300,8 +300,8 @@ You can inspect the list of CA Certificates that have been installed:

``` console
user@host $ osg-ca-manage listCA
Hash=09ff08b7; Subject= /C=FR/O=CNRS/CN=CNRS2-Projets; Issuer= /C=FR/O=CNRS/CN=CNRS2; Accreditation=Unknown; Status=https://repo.opensciencegrid.org/cadist/ca-certs-version-new
Hash=0a12b607; Subject= /DC=org/DC=ugrid/CN=UGRID CA; Issuer= /DC=org/DC=ugrid/CN=UGRID CA; Accreditation=Unknown; Status=https://repo.opensciencegrid.org/cadist/ca-certs-version-new
Hash=09ff08b7; Subject= /C=FR/O=CNRS/CN=CNRS2-Projets; Issuer= /C=FR/O=CNRS/CN=CNRS2; Accreditation=Unknown; Status=https://repo.osg-htc.org/cadist/ca-certs-version-new
Hash=0a12b607; Subject= /DC=org/DC=ugrid/CN=UGRID CA; Issuer= /DC=org/DC=ugrid/CN=UGRID CA; Accreditation=Unknown; Status=https://repo.osg-htc.org/cadist/ca-certs-version-new
[...]
```

Expand Down
2 changes: 1 addition & 1 deletion docs/security/host-certs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ We recommend requesting host certificates from one of the following CAs:
Let's Encrypt is not IGTF-accredited so their certificates are not suitable for WLCG services.

If neither of the above options work for your site, the OSG Fabric of Services also accepts all
[IGTF-accredited CAs](https://repo.opensciencegrid.org/cadist/).
[IGTF-accredited CAs](https://repo.osg-htc.org/cadist/).


!!!note
Expand Down
2 changes: 1 addition & 1 deletion docs/submit/install-ospool-ap.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ required packages. Example on a RHEL 9 host:

```console
# yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
# yum install https://repo.opensciencegrid.org/osg/24-main/osg-24-main-el9-release-latest.rpm
# yum install https://repo.osg-htc.org/osg/24-main/osg-24-main-el9-release-latest.rpm
# yum install osg-flock
```

Expand Down
8 changes: 4 additions & 4 deletions docs/worker-node/install-wn-tarball.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ Download the WN Client
!!! info "Where is the OSG 24 worker node tarball?"
We plan to distribute the worker node tarball in the coming weeks.

Please pick the `osg-wn-client` tarball that is appropriate for your distribution and architecture. You will find them in <https://repo.opensciencegrid.org/tarball-install/> .
Please pick the `osg-wn-client` tarball that is appropriate for your distribution and architecture. You will find them in <https://repo.osg-htc.org/tarball-install/> .

For OSG 23:

- [Binaries for RHEL8-compatible](https://repo.opensciencegrid.org/tarball-install/23-main/osg-wn-client-latest.el8.x86_64.tar.gz)
- [Binaries for RHEL9-compatible](https://repo.opensciencegrid.org/tarball-install/23-main/osg-wn-client-latest.el9.x86_64.tar.gz)
- [Binaries for RHEL8-compatible](https://repo.osg-htc.org/tarball-install/23-main/osg-wn-client-latest.el8.x86_64.tar.gz)
- [Binaries for RHEL9-compatible](https://repo.osg-htc.org/tarball-install/23-main/osg-wn-client-latest.el9.x86_64.tar.gz)

Install the WN Client
---------------------
Expand All @@ -57,7 +57,7 @@ Example EL9 installation (in `/home/user/test-install`, the **`<PATH_TO_CLIENT>/
```console
user@host $ mkdir /home/user/test-install
user@host $ cd /home/user/test-install
user@host $ wget https://repo.opensciencegrid.org/tarball-install/24-main/osg-wn-client-latest.el9.x86_64.tar.gz
user@host $ wget https://repo.osg-htc.org/tarball-install/24-main/osg-wn-client-latest.el9.x86_64.tar.gz
user@host $ tar xzf osg-wn-client-latest.el9.x86_64.tar.gz
user@host $ cd osg-wn-client
user@host $ ./osg/osg-post-install
Expand Down

0 comments on commit 32f2e9a

Please sign in to comment.