Format buildscripts (pretty unsubstantial but needed to happen :3)

This commit is contained in:
Elizabeth Hunt 2023-02-11 23:37:47 -07:00
parent e5ac660413
commit 7568b61444
Signed by: simponic
GPG Key ID: 52B3774857EB24B1
9 changed files with 72 additions and 71 deletions

View File

@ -167,7 +167,7 @@ function build_server_nodes() {
copy_ssh_keys
for node_id in "${server_node_ids[@]}"
do
build_server $node_id
build_server $node_id &
done
}

View File

@ -23,8 +23,8 @@ server {
# Grab deps
if [ $(which node) == "" ]
then
curl -sSL https://deb.nodesource.com/setup_16.x | sudo bash -
sudo apt install -y nodejs
curl -sSL https://deb.nodesource.com/setup_16.x | sudo bash -
sudo apt install -y nodejs
fi
[ "$(which git)" != "" ] || sudo apt install -y git
[ "$(which nginx)" != "" ] || sudo apt install -y nginx
@ -32,16 +32,16 @@ fi
# Checkout source
if [ ! -d $chessh_path ]
then
mkdir -p $chessh_path
cd $chessh_path
git init
git remote add origin $chessh_source
git pull origin
git checkout main
git config pull.rebase true
mkdir -p $chessh_path
cd $chessh_path
git init
git remote add origin $chessh_source
git pull origin
git checkout main
git config pull.rebase true
else
cd $chessh_path
git pull origin main
cd $chessh_path
git pull origin main
fi
# Build

View File

@ -9,22 +9,22 @@ chessh_path="$HOME/src/chessh"
[ "$(which git)" != "" ] || sudo apt install -y git
if [ "$(which docker)" = "" ]
then
curl -sSL https://get.docker.com | sh
curl -sSL https://get.docker.com | sh
fi
# Checkout source
if [ ! -d $chessh_path ]
then
mkdir -p $chessh_path
cd $chessh_path
git init
git remote add origin $chessh_source
git pull origin
git checkout main
git config pull.rebase true
mkdir -p $chessh_path
cd $chessh_path
git init
git remote add origin $chessh_source
git pull origin
git checkout main
git config pull.rebase true
else
cd $chessh_path
git pull origin main
cd $chessh_path
git pull origin main
fi
# Build

View File

@ -7,7 +7,7 @@ export $(cat $env_file | xargs)
docker build ../.. -t chessh/server
docker build \
--build-arg REACT_APP_DISCORD_OAUTH=${REACT_APP_DISCORD_OAUTH} \
--build-arg REACT_APP_SSH_SERVER=${REACT_APP_SSH_SERVER} \
--build-arg REACT_APP_SSH_PORT=${REACT_APP_SSH_PORT} \
../../front -t chessh/frontend
--build-arg REACT_APP_DISCORD_OAUTH=${REACT_APP_DISCORD_OAUTH} \
--build-arg REACT_APP_SSH_SERVER=${REACT_APP_SSH_SERVER} \
--build-arg REACT_APP_SSH_PORT=${REACT_APP_SSH_PORT} \
../../front -t chessh/frontend

View File

@ -8,50 +8,50 @@ container_names=("chessh-redis" "chessh-database" "chessh-server" "chessh-fronte
export $(cat $env_file | xargs)
for name in ${container_names[@]}; do
docker stop $name
docker rm $name
docker stop $name
docker rm $name
done
docker network ls | grep -q $project_name || docker network create --driver bridge $project_name
docker volume ls | grep -q $project_name-redisdata || docker volume create $project_name-redisdata
docker run \
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-redis \
--net-alias redis \
--volume $project_name-redisdata:/data/ \
redis
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-redis \
--net-alias redis \
--volume $project_name-redisdata:/data/ \
redis
docker volume ls | grep -q $project_name-pgdata || docker volume create $project_name-pgdata
docker run \
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-database \
--net-alias database \
--volume $project_name-pgdata:/var/lib/postgresql/data/ \
postgres
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-database \
--net-alias database \
--volume $project_name-pgdata:/var/lib/postgresql/data/ \
postgres
docker run \
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-server \
--publish "${HOST}:${SSH_PORT}:${SSH_PORT}/tcp" \
--net-alias server \
chessh/server
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-server \
--publish "${HOST}:${SSH_PORT}:${SSH_PORT}/tcp" \
--net-alias server \
chessh/server
docker run \
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-frontend \
--publish "${HOST}:${WEB_PORT}:80/tcp" \
--net-alias frontend \
chessh/frontend
-d \
--restart unless-stopped \
--env-file $env_file \
--network $project_name \
--name $project_name-frontend \
--publish "${HOST}:${WEB_PORT}:80/tcp" \
--net-alias frontend \
chessh/frontend

View File

@ -17,6 +17,9 @@ export const Root = () => {
</Link>
</div>
<div className="nav">
<Link className="link" to="/man-pages">
Man Pages
</Link>
{signedIn ? (
<>
<Link className="link" to="/home">
@ -42,9 +45,6 @@ export const Root = () => {
</a>
</>
)}
<Link className="link" to="/man-pages">
Man Pages
</Link>
</div>
</div>
<div className="content">

View File

@ -3,11 +3,10 @@ import { Link } from "react-router-dom";
import { useAuthContext } from "../context/auth_context";
const generateSSHConfig = (username) => `
Host chessh
const generateSSHConfig = (username) => `Host chessh
Hostname ${process.env.REACT_APP_SSH_SERVER}
Port ${process.env.REACT_APP_SSH_PORT}
User "${username}"
User ${username.includes(" ") ? '"' + username + '"' : username}"
PubkeyAuthentication yes
`;

View File

@ -56,7 +56,7 @@ export const ManPages = () => {
<ul>
<li>Ctrl + b / Escape to return to the main menu.</li>
<li>Ctrl + c / Ctrl + d to exit CheSSH at any point.</li>
<li>Arrow keys / vim keybinds to move around the board.</li>
<li>Arrow keys / hjkl keybinds to move around the board.</li>
<li>
Select a piece with "enter", and move it to a square by pressing
"enter" again.

View File

@ -21,13 +21,15 @@ defmodule Chessh.DiscordNotifier do
@impl true
def handle_info({:attempt_notification, notification} = body, state) do
[discord_notification_rate, discord_notification_rate_ms] =
[discord_notification_rate, discord_notification_rate_ms, reschedule_delay] =
Application.get_env(:chessh, RateLimits)
|> Keyword.take([:discord_notification_rate, :discord_notification_rate_ms])
|> Keyword.take([
:discord_notification_rate,
:discord_notification_rate_ms,
:reschedule_delay
])
|> Keyword.values()
reschedule_delay = Application.get_env(:chessh, RateLimits)[:reschedule_delay]
case Hammer.check_rate_inc(
:redis,
"discord-rate",