parameterize deployment a bit more
Iris Lightshard nilix@nilfm.cc
PGP Signature
-----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQR2zYvweXfSPsSU6pP1Tg1AaVJx1AUCZTNXMQAKCRD1Tg1AaVJx 1NdnAQDaPe0doNOJKxrJn0nh2oeYP08sONco4aZVdkmo8aWZPQD/Yyw0cZgZIls3 89oTkmbGD1WCo7BU+sC7fEsZEMY0vwI= =Z/EW -----END PGP SIGNATURE-----
2 files changed,
8 insertions(+),
6 deletions(-)
M
config.def.h
→
config.def.h
@@ -2,9 +2,10 @@ /* clang-format off */
#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 "<img src='/img/nilfm_blackHole_128.png' alt='blackhole://nilFM'/>" -#define MAINCSS "/nilfm.css?v=20220119.0" +#define MAINCSS "/nilfm.css?v=20230819.0" #define FOOTER_HTML "<div style='float:right;text-align:center;'><a href='https://hacklab.nilfm.cc' target='_blank'><img src='/img/git.svg' alt='nilFM hack lab'/></a> \n" \ "<a href='https://cafe.nilfm.cc/u/nilix' target='_blank'><img src='/img/honk.svg' alt='honk'/></a> \n" \ "<a href='https://webring.xxiivv.com' target='_blank'><img src='/img/webring.svg' alt='xxiivv webring'/></a> \n" \@@ -14,14 +15,14 @@ #define LICENSE_HTML "<a rel='license' target='_blank' href='/legal.html'><img src='/img/cc.svg' alt='legal stuff'/></a></div>"
#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: <a href='mailto:nilix@nilfm.cc' class='mono'>nilix@nilfm.cc</a><br/><a href='/serv/90587A740FA4FFA0971575383B7FBC22144E6398.asc' style='font-family:monospace;display:inline-block;max-width:24ch;'>9058 7A74 0FA4 FFA0 9715 7538 3B7F BC22 144E 6398</a>\n" \ +#define CONTACT_HTML "contact: <a href='mailto:nilix@nilfm.cc' class='mono'>nilix@nilfm.cc</a><br/><a href='/serv/76CD8BF07977D23EC494EA93F54E0D40695271D4.asc' style='font-family:monospace;display:inline-block;max-width:24ch;'>76CD 8BF0 7977 D23E C494 EA93 F54E 0D40 6952 71D4</a>\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 <<a style='font-family:monospace;' href='mailto:nilix@nilfm.cc'>nilix@nilfm.cc</a>><br/>\n" \ "software artisan, digital philosopher<br/><br/>\n" \ -"<a href='/serv/90587A740FA4FFA0971575383B7FBC22144E6398.asc' style='font-family:monospace;display:inline-block;max-width:24ch;'>9058 7A74 0FA4 FFA0 9715 7538 3B7F BC22 144E 6398</a>\n" \ +"<a href='/serv/76CD8BF07977D23EC494EA93F54E0D40695271D4.asc' style='font-family:monospace;display:inline-block;max-width:24ch;'>76CD 8BF0 7977 D23E C494 EA93 F54E 0D40 6952 71D4</a>\n" \ "" #define NAME "nilFM" /* clang-format on */
M
deploy.sh
→
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