nick12
/
hmn
forked from hmn/hmn
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More server setup stuff I dunno I'm sorry

This commit is contained in:
Ben Visness 2021-09-04 16:09:01 -05:00
parent e19656e2ef
commit a42973c3cb
6 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinera/setup.sh
View File

@ -16,6 +16,8 @@ chgrp $ANNOTATIONS_USER_GROUP $CINERA_SCRIPT_PATH
chgrp $ANNOTATIONS_USER_GROUP $CINERA_SCRIPT_PATH/data chgrp $ANNOTATIONS_USER_GROUP $CINERA_SCRIPT_PATH/data
./update_cinera.sh ./update_cinera.sh
./update_annotations.sh
CMD="cd $CINERA_SCRIPT_PATH; ./update_annotations.sh"
su - $ANNOTATIONS_USER -c "$CMD"
mkdir -p data mkdir -p data

2
cinera/update_annotations.sh
View File

@ -7,7 +7,7 @@ fi
. cinera.conf . cinera.conf
if [ ! -d $CINERA_HMML_PATH ]; then if [ ! -d $CINERA_HMML_PATH ]; then
git clone git@gitssh.handmade.network:Annotation-Pushers/cinera_handmade.network.git $CINERA_HMML_PATH git clone --config core.sshCommand="ssh -i ~/.ssh/gitlab-hmml" git@gitssh.handmade.network:Annotation-Pushers/cinera_handmade.network.git $CINERA_HMML_PATH
fi fi
if [ ! -d $CINERA_HMML_PATH ]; then if [ ! -d $CINERA_HMML_PATH ]; then

2
cinera/user_update_cinera.sh
View File

@ -7,7 +7,7 @@ fi
. cinera.conf . cinera.conf
if [ ! -d $CINERA_REPO_PATH ]; then if [ ! -d $CINERA_REPO_PATH ]; then
git clone git@gitssh.handmade.network:Annotation-Pushers/Annotation-System.git $CINERA_REPO_PATH git clone --config core.sshCommand="ssh -i ~/.ssh/gitlab-annotation-system" git@gitssh.handmade.network:Annotation-Pushers/Annotation-System.git $CINERA_REPO_PATH
fi fi
if [ ! -d $CINERA_REPO_PATH ]; then if [ ! -d $CINERA_REPO_PATH ]; then

2
server/adminmailer.sh
View File

@ -4,6 +4,6 @@ if [ $SERVICE_RESULT == "success" ]; then
exit exit
fi fi
/home/hmn/hmn/adminmailer/adminmailer "[$1] Status changed" <<ERRMAIL adminmailer "[$1] Status changed" <<ERRMAIL
$(systemctl status --full "$1") $(systemctl status --full "$1")
ERRMAIL ERRMAIL

76
server/serversetup.sh
View File

@ -136,22 +136,34 @@ SCRIPT
savecheckpoint 80 savecheckpoint 80
fi fi
# Set up SSH # Set up SSH for hmn
if [ $checkpoint -lt 81 ]; then if [ $checkpoint -lt 81 ]; then
set +x set +x
do_as hmn <<'SCRIPT' do_as hmn <<'SCRIPT'
ssh-keygen -t ed25519 -C "beta-server" -N "" -f ~/.ssh/gitlab ssh-keygen -t ed25519 -C "beta-server" -N "" -f ~/.ssh/gitlab-hmn
git config --global core.sshCommand "ssh -i ~/.ssh/gitlab" git config --global core.sshCommand "ssh -i ~/.ssh/gitlab-hmn"
SCRIPT
do_as annotations <<'SCRIPT'
ssh-keygen -t ed25519 -C "beta-server" -N "" -f ~/.ssh/gitlab-annotation-system
ssh-keygen -t ed25519 -C "beta-server" -N "" -f ~/.ssh/gitlab-hmml
SCRIPT
echo "" echo ""
echo "Add the following keys as Deploy Keys to the following projects:"
echo "" echo ""
echo "Copy the following key and add it as a Deploy Key in the project in GitLab (https://git.handmade.network/hmn/hmn/-/settings/ci_cd#js-deploy-keys-settings):" cat /home/hmn/.ssh/gitlab-hmn.pub
echo "https://git.handmade.network/hmn/hmn/-/settings/ci_cd#js-deploy-keys-settings"
echo "" echo ""
cat ~/.ssh/gitlab.pub cat /home/annotations/.ssh/gitlab-annotation-system.pub
echo "https://git.handmade.network/Annotation-Pushers/Annotation-System/-/settings/ci_cd#js-deploy-keys-settings"
echo ""
cat /home/annotations/.ssh/gitlab-hmml.pub
echo "https://git.handmade.network/Annotation-Pushers/cinera_handmade.network/-/settings/ci_cd#js-deploy-keys-settings"
echo "" echo ""
echo "Run this script again when you're done - it will continue where it left off." echo "Run this script again when you're done - it will continue where it left off."
exit 0 exit 0
SCRIPT
savecheckpoint 81 savecheckpoint 81
@ -160,19 +172,51 @@ SCRIPT
exit 0 exit 0
fi fi
# Test SSH # Test SSH for hmn
if [ $checkpoint -lt 82 ]; then if [ $checkpoint -lt 82 ]; then
do_as hmn <<'SCRIPT' do_as hmn <<'SCRIPT'
set -euxo pipefail set -euxo pipefail
if ! ssh -T -i ~/.ssh/gitlab git@gitssh.handmade.network; then if ! ssh -T -i ~/.ssh/gitlab-hmn git@gitssh.handmade.network; then
set +x set +x
echo "Failed to connect to GitLab. Fix the issue and then run this script again." echo "Copy the following key:"
echo "" echo ""
echo "Copy the following key and add it as a Deploy Key in the project in GitLab (https://git.handmade.network/hmn/hmn/-/settings/ci_cd#js-deploy-keys-settings):" cat ~/.ssh/gitlab-hmn
echo "" echo ""
cat ~/.ssh/gitlab.pub echo "Add it as a Deploy Key to the HMN project in GitLab:"
echo ""
echo " https://git.handmade.network/hmn/hmn/-/settings/ci_cd#js-deploy-keys-settings"
echo ""
exit 1
fi
SCRIPT
do_as annotations <<'SCRIPT'
if ! ssh -T -i ~/.ssh/gitlab-annotation-system git@gitssh.handmade.network; then
set +x
echo "Copy the following key:"
echo ""
cat ~/.ssh/gitlab-annotation-system
echo ""
echo "Add it as a Deploy Key to this project in GitLab:"
echo ""
echo " https://git.handmade.network/Annotation-Pushers/Annotation-System/-/settings/ci_cd#js-deploy-keys-settings"
echo ""
exit 1
fi
if ! ssh -T -i ~/.ssh/gitlab-hmml git@gitssh.handmade.network; then
set +x
echo "Copy the following key:"
echo ""
cat ~/.ssh/gitlab-hmml
echo ""
echo "Add it as a Deploy Key to this project in GitLab:"
echo ""
echo " https://git.handmade.network/Annotation-Pushers/cinera_handmade.network/-/settings/ci_cd#js-deploy-keys-settings"
echo "" echo ""
exit 1 exit 1
fi fi
@ -231,6 +275,9 @@ if [ $checkpoint -lt 105 ]; then
# See https://stackoverflow.com/a/9625233/1177139 # See https://stackoverflow.com/a/9625233/1177139
(crontab -l 2>/dev/null; echo "50 4 * * * /home/hmn/hmn/server/backup.sh") | crontab - (crontab -l 2>/dev/null; echo "50 4 * * * /home/hmn/hmn/server/backup.sh") | crontab -
# TODO: This seems to fail the first time you run it? But then works fine afterward, thanks
# to checkpoints. Probably should fix this someday.
savecheckpoint 105 savecheckpoint 105
fi fi
@ -315,7 +362,7 @@ ${BLUE_BOLD}Admin mailer${RESET}: /home/hmn/hmn/adminmailer/config.go
Fill in the config file and build the mailer: Fill in the config file and build the mailer:
cd /home/hmn/hmn/adminmailer cd /home/hmn/hmn/adminmailer
go build . go build -o /usr/bin/adminmailer .
${BLUE_BOLD}===== Next steps =====${RESET} ${BLUE_BOLD}===== Next steps =====${RESET}
@ -336,6 +383,11 @@ Restore static files:
make restore-static-files make restore-static-files
Set up Cinera:
cd /home/hmn/hmn/cinera
./setup.sh
Start up Caddy: Start up Caddy:
systemctl start caddy systemctl start caddy

5
src/migration/migration.go
View File

@ -367,13 +367,8 @@ func SeedFromFile(seedFile string, afterMigration types.MigrationVersion) {
fmt.Println("Running command:", cmd) fmt.Println("Running command:", cmd)
if output, err := cmd.CombinedOutput(); err != nil { if output, err := cmd.CombinedOutput(); err != nil {
fmt.Print(string(output)) fmt.Print(string(output))
exitError, isExit := err.(*exec.ExitError)
if isExit {
panic(fmt.Errorf("failed to execute seed: %w\n%s", err, string(exitError.Stderr)))
} else {
panic(fmt.Errorf("failed to execute seed: %w", err)) panic(fmt.Errorf("failed to execute seed: %w", err))
} }
}
fmt.Println("Done! You may want to migrate forward from here.") fmt.Println("Done! You may want to migrate forward from here.")
ListMigrations() ListMigrations()