diff --git a/.gitignore b/.gitignore index d4afe78..a324e57 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,9 @@ .env .venv/ /content/calendar/ -/content/feed/ -/content/hash/ -/content/video/ +/content/pen/ +/content/shouts/ +/content/social/ +/content/tv/ /public/ resources diff --git a/README.md b/README.md index 73d104b..371caa5 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ export CALENDAR_URL="https://cloud.lumbung.space/remote.php/dav/public-calendars export OUTPUT_DIR=content/calendar lumbunglib-cal -export OUTPUT_DIR=content/video +export OUTPUT_DIR=content/tv lumbunglib-vid -export OUTPUT_DIR=content/feed +export OUTPUT_DIR=content/shouts lumbunglib-feed # reads ./feeds_list.txt -export OUTPUT_DIR=content/hash +export OUTPUT_DIR=content/social export MASTODON_AUTH_TOKEN=foobar lumbunglib-hash ``` diff --git a/compose.yml b/compose.yml index c6fc067..0816723 100644 --- a/compose.yml +++ b/compose.yml @@ -33,17 +33,17 @@ services: - "traefik.http.services.coop-cloud-site.loadbalancer.server.port=1313" - "traefik.http.routers.coop-cloud-site.tls.certresolver=production" - peertube: + tv: image: decentral1se/beta.lumbung.space-scripts:latest volumes: - content:/src/content environment: - OUTPUT_DIR: /src/content/video + OUTPUT_DIR: /src/content/tv command: | bash -c " while true do - echo 'generating peertube posts...' + echo 'generating tv posts...' /usr/local/bin/lumbunglib-vid echo 'going to sleep for 5 minutes...' sleep 300 @@ -68,7 +68,7 @@ services: done " - feed: + shouts: image: decentral1se/beta.lumbung.space-scripts:latest volumes: - content:/src/content @@ -76,32 +76,52 @@ services: - source: feeds_list target: /src/feeds_list.txt environment: - OUTPUT_DIR: /src/content/feed + OUTPUT_DIR: /src/content/shouts command: | bash -c " while true do - echo 'generating feed posts...' + echo 'generating shouts posts...' /usr/local/bin/lumbunglib-feed echo 'going to sleep for 5 minutes...' sleep 300 done " - hashtag: + pen: + image: decentral1se/beta.lumbung.space-scripts:latest + volumes: + - content:/src/content + configs: + - source: feeds_list_pen + target: /src/feeds_list.txt + environment: + OUTPUT_DIR: /src/content/pen + command: | + bash -c " + while true + do + echo 'generating pen posts...' + /usr/local/bin/lumbunglib-feed + echo 'going to sleep for 5 minutes...' + sleep 300 + done + " + + social: image: decentral1se/beta.lumbung.space-scripts:latest volumes: - content:/src/content/ secrets: - masto_key environment: - OUTPUT_DIR: /src/content/hash + OUTPUT_DIR: /src/content/social command: | bash -c " export MASTODON_AUTH_TOKEN=`cat /run/secrets/masto_key`; while true do - echo 'generating mastodon posts...' + echo 'generating social posts...' /usr/local/bin/lumbunglib-hash echo 'going to sleep for 5 minutes...' sleep 300 @@ -119,6 +139,9 @@ configs: feeds_list: name: beta_lumbung_space_feeds_list_v1 file: feeds_list.txt + feeds_list_pen: + name: beta_lumbung_space_feeds_list_pen_v1 + file: feeds_list_pen.txt secrets: masto_key: diff --git a/feeds_list_pen.txt b/feeds_list_pen.txt new file mode 100644 index 0000000..66a3dea --- /dev/null +++ b/feeds_list_pen.txt @@ -0,0 +1 @@ +https://pen.lumbung.space/feed/ diff --git a/makefile b/makefile index 389c749..6e61ffb 100644 --- a/makefile +++ b/makefile @@ -7,8 +7,8 @@ gen: @CALENDAR_URL="https://cloud.lumbung.space/remote.php/dav/public-calendars/WbnHM8YdCkKT6bcT?export"; \ OUTPUT_DIR=content/calendar; \ lumbunglib-cal && \ - OUTPUT_DIR=content/video lumbunglib-vid && \ - OUTPUT_DIR=content/feed lumbunglib-feed + OUTPUT_DIR=content/tv lumbunglib-vid && \ + OUTPUT_DIR=content/shouts lumbunglib-feed push-hugo: @docker build -t decentral1se/beta.lumbung.space -f Dockerfile.hugo . && \ diff --git a/themes/lumbung-theme/layouts/partials/header.html b/themes/lumbung-theme/layouts/partials/header.html index 337d08f..da79a22 100644 --- a/themes/lumbung-theme/layouts/partials/header.html +++ b/themes/lumbung-theme/layouts/partials/header.html @@ -48,9 +48,12 @@
  • home
  • about
  • calendar
  • -
  • tv
  • -
  • socials
  • -
  • feeds
  • +
  • tv
  • +
  • social
  • +
  • pen
  • +
  • shouts
  • +
  • documenta news
  • +
  • documenta newsletter