diff --git a/helperbot b/helperbot index 3ff419d..5451291 100755 --- a/helperbot +++ b/helperbot @@ -704,8 +704,9 @@ function fedi_sync_blocklists { # update standalone frontends function fedi_update_frontends { - local mastodon_fe_url=https://github.com/sneexy-boi/synth.download/releases/download/fedi-frontend/masto-fe.zip - local akkoma_fe_url=https://github.com/sneexy-boi/synth.download/releases/download/fedi-frontend/akkoma-fe.zip + local chuckya_fe_url=https://github.com/sneexy-boi/synth.download/releases/download/fedi-frontend/chuckya-fe.zip + local akkoma_chuckya_url=https://github.com/sneexy-boi/synth.download/releases/download/fedi-frontend/akkoma-fe-chuckya.zip + local akkoma_iceshrimp_url=https://github.com/sneexy-boi/synth.download/releases/download/fedi-frontend/akkoma-fe-iceshrimp.zip local phanpy_url=https://github.com/cheeaun/phanpy/releases/latest/download/phanpy-dist.zip local pl_fe_url=https://pl.mkljczk.pl/pl-fe.zip local frontend_folder=/var/www/fedi-frontends @@ -728,11 +729,15 @@ function fedi_update_frontends { if [ -d "$frontend_folder" ]; then # update mastodon echo "${blue}Updating Mastodon...${normal}" - _repeat_process $mastodon_fe_url masto-fe chuckya-fe + _repeat_process $chuckya_fe_url chuckya-fe chuckya-fe echo "${green}Okay.${normal}" - # update akkoma - echo "${blue}Updating Akkoma...${normal}" - _repeat_process $akkoma_fe_url akkoma-fe akkoma-fe + # update akkoma iceshrimp + echo "${blue}Updating Akkoma for Iceshrimp.NET...${normal}" + _repeat_process $akkoma_iceshrimp_url akkoma-fe-iceshrimp akkoma-fe-iceshrimp + echo "${green}Okay.${normal}" + # update akkoma mastodon + echo "${blue}Updating Akkoma for Chuckya...${normal}" + _repeat_process $akkoma_chuckya_url akkoma-fe-chuckya akkoma-fe-chuckya echo "${green}Okay.${normal}" # update phanpy echo "${blue}Updating Phanpy...${normal}" diff --git a/neptunium/etc/caddy/sites-enabled/fedi-frontends b/neptunium/etc/caddy/sites-enabled/fedi-frontends index 7013bd3..c663447 100644 --- a/neptunium/etc/caddy/sites-enabled/fedi-frontends +++ b/neptunium/etc/caddy/sites-enabled/fedi-frontends @@ -1,5 +1,4 @@ # akkoma fe for iceshrimp -# (ONLY iceshrimp, not compatible with any other instance) akko.beeping.synth.download { # redirect api endpoints to iceshrimp @redir { @@ -23,13 +22,53 @@ akko.beeping.synth.download { handle { header Cache-Control "max-age=3600" try_files {path} / - root * /var/www/fedi-frontends/akkoma-fe + root * /var/www/fedi-frontends/akkoma-fe-iceshrimp file_server import common-settings } handle_path /static/* { header Cache-Control "max-age=3600" - root * /var/www/fedi-frontends/akkoma-fe/static + root * /var/www/fedi-frontends/akkoma-fe-iceshrimp/static + file_server + import common-settings + } + + import common-settings + import log akkofe + import robots-txt +} + +# akkoma fe for mastodon +akko.merping.synth.download { + # redirect api endpoints to iceshrimp + @redir { + path /oauth/* + path /api/* + path /nodeinfo/* + } + handle @redir { + reverse_proxy http://192.168.1.73:58834 + import common-settings + } + + # favicon + handle_path /favicon.png { + root * /var/www/site/assets/synth.download/synth.png + file_server + import common-settings + } + + # akkoma frontend + handle { + header Cache-Control "max-age=3600" + try_files {path} / + root * /var/www/fedi-frontends/akkoma-fe-chuckya + file_server + import common-settings + } + handle_path /static/* { + header Cache-Control "max-age=3600" + root * /var/www/fedi-frontends/akkoma-fe-chuckya/static file_server import common-settings }