From 15cc1c55b519749daa4ec61f6322963c330d44c7 Mon Sep 17 00:00:00 2001 From: Derek Stevens Date: Fri, 20 Oct 2023 22:44:33 -0600 Subject: [PATCH] parameterize deployment a bit more --- config.def.h | 9 +++++---- deploy.sh | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config.def.h b/config.def.h index 4526c4f..1a98988 100644 --- a/config.def.h +++ b/config.def.h @@ -2,9 +2,10 @@ #define SITEMAP "all_pages" #define DOMAIN "https://nilfm.cc" #define DEPLOY_DEST "nilix@nilfm.cc:~/lib/nilfm/" +#define DEPLOY_IDENT "id_sub" #define TAG_BODY_SIZE 4096 #define LOGO_HTML "blackhole://nilFM" -#define MAINCSS "/nilfm.css?v=20220119.0" +#define MAINCSS "/nilfm.css?v=20230819.0" #define FOOTER_HTML "
nilFM hack lab \n" \ "honk \n" \ "xxiivv webring \n" \ @@ -14,14 +15,14 @@ #define DESC "lair of drkste aka nilix: software artisan, digital philosopher" #define IS_NAV_IN_HEADER 01 #define LEXICON_SIZE 1024 -#define CONTACT_HTML "contact: nilix@nilfm.cc
9058 7A74 0FA4 FFA0 9715 7538 3B7F BC22 144E 6398\n" \ +#define CONTACT_HTML "contact: nilix@nilfm.cc
76CD 8BF0 7977 D23E C494 EA93 F54E 0D40 6952 71D4\n" \ "" -#define FRONTCSS "/nilfm.css?v=20220119.0" +#define FRONTCSS "/nilfm.css?v=20230819.0" #define SITEROOT "../www/" #define TWTXT "/twtxt.txt" #define ABOUT_HTML "Derek Stevens <nilix@nilfm.cc>
\n" \ "software artisan, digital philosopher

\n" \ -"9058 7A74 0FA4 FFA0 9715 7538 3B7F BC22 144E 6398\n" \ +"76CD 8BF0 7977 D23E C494 EA93 F54E 0D40 6952 71D4\n" \ "" #define NAME "nilFM" /* clang-format on */ diff --git a/deploy.sh b/deploy.sh index 458f385..1da630b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,9 +1,10 @@ #!/bin/sh DEST=$(grep "#define DEPLOY_DEST" config.h | awk '{print $3}' | sed -e 's/"//g') +IDENT=$(grep "#define DEPLOY_IDENT" config.h | awk '{print $3}' | sed -e 's/"//g') if [ -z "$1" ]; then - rsync -avK --delete ../ ${DEST} + rsync -avK -e "ssh -i ~/.ssh/${IDENT}" --delete ../ ${DEST} elif [ "$1" = "--resync" ]; then - rsync -avk --delete ${DEST} ../ + rsync -avk -e "ssh -i ~/.ssh/${IDENT}" --delete ${DEST} ../ fi