From e3cbe864be14e54516b2c87ababf3bbeb8504127 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 14 Aug 2019 00:32:02 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Hauptseite:=20Zeige=20Termine=20der=20n?= =?UTF-8?q?=C3=A4chsten=2020=20Tage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e812b66..dd2436b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ build_calendar: - pip install -r requirements.txt - python tools/merge_cals.py - cp static/all.ics public/all.ics - - upcoming="$(python tools/gen_upcoming.py static/all.ics 14 5|tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html + - upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5|tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html deploy_staging: image: "alpine:3.8" diff --git a/build.sh b/build.sh index 4489ab6..dac88b4 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,6 @@ hugo $(cat .hugo-params) tools/merge_cals.py -upcoming="$(tools/gen_upcoming.py static/all.ics 14 5|tr '\n' ' ')" +upcoming="$(tools/gen_upcoming.py static/all.ics 20 5|tr '\n' ' ')" cp static/all.ics public/all.ics sed -i "s#CALENDAR#$upcoming#g" public/index.html From ae512a738efaa7a9d8374aca542d226fa3e7abe9 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 14 Aug 2019 00:32:37 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Information=20=C3=BCber=20Umbau?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/_index.md | 8 ++++++++ content/page/clubdiscordia.md | 5 +++++ layouts/page/single.ics | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index ccfb285..5c53341 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,6 +1,14 @@ --- description: "Startseite CCCB mit Kurzkalender" --- +### CCCB Maintenance Days + +Während des Chaos Communication Camps nutzen wir die Gelegenheit, um die +Clubräume auf Vordermann zu bringen. Deshalb fallen die offenen Tage des Club +Discordia vom 15. bis einschließlich 27. August aus. Ab dem 29. geht es +regulär weiter. Viel Spaß am Gerät und danke für die Beachtung aller +Sicherheitsmaßnahmen! + ### Nächste Veranstaltungen: CALENDAR diff --git a/content/page/clubdiscordia.md b/content/page/clubdiscordia.md index 919a22d..5faba13 100644 --- a/content/page/clubdiscordia.md +++ b/content/page/clubdiscordia.md @@ -4,6 +4,11 @@ subtitle: "Die offenen Abende im CCCB" date: 2018-05-17T22:59:56+02:00 dtstart: 20180703T190000 dtend: 20180704T000000 +rrule_excludes: + - 20190815T190000 + - 20190820T190000 + - 20190822T190000 + - 20190827T190000 rrule: "FREQ=WEEKLY;BYDAY=TU,TH;INTERVAL=1" menu: main: diff --git a/layouts/page/single.ics b/layouts/page/single.ics index 3e6f593..28437c8 100644 --- a/layouts/page/single.ics +++ b/layouts/page/single.ics @@ -31,7 +31,7 @@ DTEND;TZID=Europe/Berlin:{{.Params.dtend}} RRULE:{{.Params.rrule}} {{if isset .Params "rrule_excludes" }} {{range .Params.rrule_excludes }} -EXDATE;TZID=Europe/Berlin:{{dateFormat "20060102T150405" . }} +EXDATE;TZID=Europe/Berlin:{{.}} {{end -}} {{end -}} LOCATION:{{with .Params.location}}{{.}}{{else}}CCCB{{end}} From 2229e2ac05ced955c904a284bbc6a333b59040b2 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 14 Aug 2019 00:51:17 +0200 Subject: [PATCH 3/5] Remove stray artifacts from previous builds --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd2436b..6bfe989 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ build_pages: expire_in: "1 week" untracked: true script: + - rm -rf public/* - apk add --no-cache --upgrade hugo - hugo $(cat .hugo-params) @@ -53,7 +54,7 @@ deploy_staging: - eval $(ssh-agent -s) - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config - echo "$PRIVATE_KEY" | ssh-add - - - rsync -e "ssh -l deploy -p 31337" -av public/ 195.54.164.87:staging + - rsync -e "ssh -l deploy -p 31337" -av --delete public/ 195.54.164.87:staging when: on_success environment: name: staging @@ -78,7 +79,7 @@ deploy_production: - eval $(ssh-agent -s) - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config - echo "$PRIVATE_KEY" | ssh-add - - - rsync -e "ssh -l deploy -p 31337" -av public/ 195.54.164.87:production + - rsync -e "ssh -l deploy -p 31337" -av --delete public/ 195.54.164.87:production when: on_success environment: name: production From 45e15e279749def84a09203ec65629017ea381ac Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 14 Aug 2019 11:47:05 +0200 Subject: [PATCH 4/5] Impressum: Fix typo --- content/page/impressum.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/page/impressum.md b/content/page/impressum.md index a287ab9..77585e2 100644 --- a/content/page/impressum.md +++ b/content/page/impressum.md @@ -7,7 +7,7 @@ berlin.ccc.de ist eine Publikation des Chaos Computer Clubs Berlin e.V. Inhalte der einzelnen Postings ist den jeweiligen Autoren zuzuschreiben. Links, die auf andere Server verweisen, dürfen in keinem Fall angeklickt werden. Bei Zuwiderhandlungen übernehmen wir keine Haftung. Copyright ist Aberglaube. -## Addresse +## Adresse ``` Chaos Computer Club Berlin / CCC (B) e.V. From 8f5c55f1fdb268f9a2acb82fd1dc17bb440401c6 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 14 Aug 2019 11:57:42 +0200 Subject: [PATCH 5/5] Beitragsordnung nicht explizit verlinken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ist bereits über die Satzung erreichbar --- content/page/beitragsordnung.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/content/page/beitragsordnung.md b/content/page/beitragsordnung.md index 306e0bd..0cdff4d 100644 --- a/content/page/beitragsordnung.md +++ b/content/page/beitragsordnung.md @@ -2,9 +2,6 @@ title: "Beitragsordnung" subtitle: "Chaos Computer Club Berlin / CCC(B) e.V." date: 2019-05-14T10:00:00+02:00 -menu: - main: - parent: "verein" --- _Stand: 17. März 2009_