Skip to content

Commit

Permalink
Merge pull request #12 from CHPC-UofU/remove-gitlab-references
Browse files Browse the repository at this point in the history
Remove gitlab references
  • Loading branch information
jay-mckay authored Aug 2, 2024
2 parents e9b118f + a6aee41 commit 3c3ffd2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
**example:**
```
mkdir arbiter2/2.1.0
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git arbiter2/2.1.0
git clone https://github.com/chpc-uofu/arbiter2.git arbiter2/2.1.0
cp arbiter2/1.3.2/etc/config.toml arbiter2/2.1.0/etc
ln -s arbiter2/2.1.0 arbiter2/latest
systemctl restart arbiter2
Expand Down Expand Up @@ -69,7 +69,7 @@ systemctl status arbiter2
**example:**
```
mkdir arbiter2/2.0.0
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git arbiter2/2.0.0
git clone https://github.com/chpc-uofu/arbiter2.git arbiter2/2.0.0
cp arbiter2/1.3.2/etc/config.toml arbiter2/2.0.0/etc
ln -s arbiter2/2.0.0 arbiter2/latest
pip3 install sqlalchemy # required for v2.0.0
Expand Down Expand Up @@ -121,7 +121,7 @@ systemctl restart arbiter2
**Example:**
```
mkdir arbiter2/1.4.0
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git arbiter2/1.4.0
git clone https://github.com/chpc-uofu/arbiter2.git arbiter2/1.4.0
cp arbiter2/1.3.3/etc/config.toml arbiter2/1.4.0/etc
# Merge new load average reporting in integrations.py and overall_high_usage_email_template.txt into previous files
ln -s arbiter2/1.4.0 arbiter2/latest
Expand Down Expand Up @@ -155,7 +155,7 @@ systemctl restart arbiter2
**example:**
```
mkdir arbiter2/1.3.3
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git arbiter2/1.3.3
git clone https://github.com/chpc-uofu/arbiter2.git arbiter2/1.3.3
cp arbiter2/1.3.2/etc/config.toml arbiter2/1.3.3/etc
ln -s arbiter2/1.3.3 arbiter2/latest
systemctl restart arbiter2
Expand Down Expand Up @@ -196,7 +196,7 @@ systemctl restart arbiter2
**Example:**
```
mkdir arbiter2/1.3.2
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git arbiter2/1.3.2
git clone https://github.com/chpc-uofu/arbiter2.git arbiter2/1.3.2
cp arbiter2/1.3.1/etc/config.toml arbiter2/1.3.2/etc
# Optionally add proc_owner_whitelist
ln -s arbiter2/1.3.2 arbiter2/latest
Expand Down
10 changes: 5 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ A sample script called [setup.sh](setup.sh) can be used a reference for installi

### Acquiring the Arbiter2 source files

You can either grab the code from git or from source files [here](https://gitlab.chpc.utah.edu/arbiter2/arbiter2).
You can either grab the code from git or from source files [here](https://github.com/CHPC-UofU/arbiter2).

```bash
VERSION=1.4.1 # See https://gitlab.chpc.utah.edu/arbiter2/arbiter2, likely a newer version
VERSION=2.1.0 # See https://github.com/CHPC-UofU/arbiter2 likely a newer version

PREFIX="/opt/"
mkdir -p $PREFIX/src/
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git $PREFIX/src/Arbiter2
git clone https://github.com/CHPC-UofU/arbiter2.git $PREFIX/src/Arbiter2
cd $PREFIX/src/Arbiter2
git checkout latest
```

Alternatively,

```bash
VERSION=1.4.1 # See https://gitlab.chpc.utah.edu/arbiter2/arbiter2, likely a newer version
VERSION=2.1.0 # See https://github.com/CHPC-UofU/arbiter2 likely a newer version

mkdir $PREFIX/src/Arbiter2/
cd $PREFIX/src/Arbiter2
wget https://gitlab.chpc.utah.edu/arbiter2/arbiter2/-/archive/$VERSION/arbiter2-$VERSION.tar.gz
wget https://github.com/CHPC-UofU/arbiter2/archive/refs/tags/v$VERSION.tar.gz
ln -s latest arbiter2-$VERSION
cd latest
```
Expand Down
2 changes: 1 addition & 1 deletion arbiter2.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Arbiter2
Documentation=https://gitlab.chpc.utah.edu/arbiter2/arbiter2
Documentation=https://github.com/chpc-uofu/arbiter2
# TODO: May need to change these depending on your setup (like adding network file system target)
# Requires network to send mail and correctly get the hostname
Wants=sendmail.service sssd.service network.target network-online.target
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fi

arbdir=`pwd`
if ask_if "Do you want to clone Arbiter2 to cwd? (if no, will ask what directory is it in)" "y"; then
git clone https://gitlab.chpc.utah.edu/arbiter2/arbiter2.git
git clone https://github.com/CHPC-UofU/arbiter2.git

elif read -p "What dir is it in? " arbdir && [ -d "$arbdir" ]; then
cd "$arbdir"
Expand Down
2 changes: 1 addition & 1 deletion tools/arbiter2-exporter.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Arbiter2 Prometheus Exporter
Documentation=https://gitlab.chpc.utah.edu/arbiter2/arbiter2
Documentation=https://github.com/chpc-uofu/arbiter2
# TODO: May need to change these depending on your setup (like adding network file system target)
# Requires network to send mail and correctly get the hostname
Wants=sendmail.service sssd.service network.target network-online.target
Expand Down

0 comments on commit 3c3ffd2

Please sign in to comment.