Add August 2021, update text for June event

Fixes #2

.drone.yml

@@ -1,35 +1,36 @@
-pipeline:
-  build:
+kind: pipeline
+name: default
+
+steps:
+  - name: build
     image: ruby
     commands:
-      - gem install bundler
+      - gem install bundler:1.17.3
       - bundle install
       - bundle exec jekyll build
   
-  docker:
+  - name: docker
     image: plugins/docker
-    repo: docker.data.coop/cryptohagen-website
-    registry: docker.data.coop
-    secrets: [DOCKER_USERNAME, DOCKER_PASSWORD]
-    username:
-      from_secret: DOCKER_USERNAME
-    password:
-      from_secret: DOCKER_PASSWORD
-    tag: 
-      - "${DRONE_BUILD_NUMBER}"
-      - "latest"
+    settings:
+      repo: docker.data.coop/cryptohagen-website
+      registry: docker.data.coop
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+      tags:
+        - "${DRONE_BUILD_NUMBER}"
+        - "latest"
     when:
       branch:
         - master
-#    
-#  notify:
-#    image: plugins/matrix
-#    secrets: [matrix_username, matrix_password]
-#    settings:
-#      homeserver: https://data.coop
-#      roomid: plKSghHbepWeUEtbHE:data.coop
-#      username: 
-#        from_secret: matrix_username
-#      password:
-#        from_Secret: matrix_password
-#
+  
+  - name: notify
+    image: plugins/matrix
+    settings:
+      homeserver: https://data.coop
+      roomid: plKSghHbepWeUEtbHE:data.coop
+      username: 
+        from_secret: matrix_username
+      password:
+        from_secret: matrix_password

.gitignore

@@ -1,5 +1,6 @@
 *.sw*
 _site
 .jekyll-metadata
+.jekyll-cache
 .sass-cache
 .bundle/

Gemfile

@@ -9,7 +9,7 @@ ruby RUBY_VERSION
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", ">= 3.8.5"
+gem "jekyll", ">= 4.2.0"
 
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and

Gemfile.lock

@@ -1,73 +1,77 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.4)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.7)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.10.0)
+    ffi (1.14.2)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-watch (2.1.2)
+      terminal-table (~> 2.0)
+    jekyll-feed (0.15.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.3.0)
-    ruby_dep (1.5.0)
+    rexml (3.2.4)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
-    sass (3.7.3)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (>= 3.8.5)
+  jekyll (>= 4.2.0)
   jekyll-feed (~> 0.6)
   jekyll-sitemap
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.6.1p33
+   ruby 2.6.5p114
 
 BUNDLED WITH
    1.17.3

_config.yml

@@ -5,7 +5,7 @@ includes_dir: _sections
 sass:
     style: compressed
     
-gems: 
+plugins: 
     - jekyll-feed
     - jekyll-sitemap
 exclude:

_data/events.yml

@@ -1,18 +1,18 @@
-- danish_title: "Søndag d. 31. marts 2019"
-  danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!"
-  english_title: "Sunday March 31st 2019"
-  english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!"
+- danish_title: "Søndag d. 27. juni 2021"
+  danish_text: "Søndag d. 27. Juni fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder. Myndighederne foreskriver 'kørekort modellen' - dvs. at det forventes at den enkelte selv har styr på sine COVID test/vacciner for at være med."
+  english_title: "Sunday May 30th 2021"
+  english_text: "#Cryptohagen at Café Mellemrummet is on again this Sunday the. 27th June from 13 to 17. Come by for a chat and a nice cup of coffee. Remember to have a valid Covid passport before you show up."
   time: "13:00-17:00"
   current: true
-- danish_title: "Søndag d. 28. april 2019"
-  danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!"
-  english_title: "Sunday April 28th 2019"
-  english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!"
+- danish_title: "Søndag d. 25. juli 2021"
+  danish_text: "Følg med på Twitter, IRC eller Matrix for opdateringer vedr. Covid-19 situationen i relation til Cryptohagen."
+  english_title: "Sunday July 25th 2021"
+  english_text: "Follow along on Twitter, IRC or Matrix for updates regarding the Covid-19 situation and Cryptohagen."
   time: "13:00-17:00"
   current: false
-- danish_title: "Søndag d. 26. maj 2019"
-  danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!"
-  english_title: "Sunday May 26th 2019"
-  english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!"
+- danish_title: "Søndag d. 30. august 2021"
+  danish_text: "Følg med på Twitter, IRC eller Matrix for opdateringer vedr. Covid-19 situationen i relation til Cryptohagen."
+  english_title: "Sunday August 30th 2021"
+  english_text: "Follow along on Twitter, IRC or Matrix for updates regarding the Covid-19 situation and Cryptohagen."
   time: "13:00-17:00"
-  current: false
+  current: false

_data/links.yml

@@ -10,6 +10,6 @@
 - name: "EFF's Security Education Companion"
   url: "https://sec.eff.org/"
   desc: "A free resource for digital security educators"
-- name: "CopenhagenSec"
-  url: "https://www.meetup.com/CopenhagenSec/"
-  desc: "A meetup group in Copenhagen about (advanced) IT security"
+- name: "Data Detox Kit"
+  url: "https://datadetoxkit.org/en/home/"
+  desc: "Everyday steps you can take to control your digital privacy, security, and wellbeing"

_layouts/base.html

@@ -20,6 +20,14 @@
     <meta charset="utf-8">
     <title>{{ site.data.strings[title] }}</title>
     <link rel="stylesheet" href="/assets/css/cryptohagen.css" />
+
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@cryptohagen">
+    <meta name="twitter:creator" content="@cryptohagen">
+    <meta name="twitter:title" content="Cryptohagen - Lær om privatliv og digitalt selvforsvar">
+    <meta name="twitter:description" content="Cryptohagen er et månedligt meetup i København for folk, der er interesserede i digitalt privatliv, overvågning og at lære om de nyeste teknikker og værktøjer til at beskytte sig online.">
+    <meta name="twitter:image" content="https://www.cryptohagen.dk/assets/logo/logo.png">
+
   </head>
   <body>
 
@@ -69,6 +77,16 @@
         </li>
       </ul>
     </nav>
+    
+    <section id="logo">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-8">
+      	    <img src="assets/logo/logo.png" />
+          </div>
+        </div>
+      </div>
+    </section>
 
     <section id="intro">
       <div class="container">
@@ -196,7 +214,7 @@
 
     <footer>
       <div class="container">
-        <small>Generously hosted by <a href="https://data.coop">data.coop</a> | <a href="https://git.data.coop/cryptohagen.dk/website">Source code</a> | Site built: {{ "now" | date: "%Y-%m-%d %H:%M" }} UTC | Jekyll {{ jekyll.version }}</small>
+        <small>Generously hosted by <a href="https://data.coop">data.coop<img src="assets/logo/DataCoop_Logo.png" /></a>  | <a href="https://git.data.coop/cryptohagen.dk/website">Source code</a> | Site built: {{ "now" | date: "%Y-%m-%d %H:%M" }} UTC | Jekyll {{ jekyll.version }}</small>
       </div>
     </footer>
 

_sass/bootstrap/scss/mixins/_cards.scss

@@ -35,4 +35,8 @@
       color: $card-link-hover-color;
     }
   }
+  .card-text > a {
+      color: #fff;
+  }
+  
 }

_sections/who_da.md

@@ -11,25 +11,28 @@ Der afholdes lignende arrangementer i [Aarhus][cryptoaarhus].
 Arrangementet er for alle, der bruger internettet i en eller anden
 form.
 
-- Du er skoleelev, og skal søge oplysninger om følsomme emner såsom
-  Al-Quaeda, ISIS og selvmordsbomber
+- Du er måske studerende, og skal søge oplysninger eller lave research om følsomme emner
 - Måske lever du i et problematisk parforhold og vil kunne søge hjælp
   og oplysning, uden at din partner bliver gjort opmærksom på det
-- En undersøgende journalist, der har brug for værktøjer til,
-  at beskytte en vigtig kilde
-- Eller du er måske den kommende Edward Snowden
+- En journalist, der har brug for værktøjer til,
+  at beskytte en kilde
+- Eller du er måske en kommende whistleblower
 
 Der vil være tidspunkter hvor alle har behov for, at kunne bevæge sig
 rundt på nettet eller kommunikere med andre, uden at nogen 'lytter
 med'. Også dig, der til hverdag ikke mener, du har noget at skjule.
 
-Vi sidder en flok nørder og er klar til at hjælpe dig i gang med, at
-bruge nogle af de populære og anerkendte sikkerhedsværktøjer; både på
-din smartphone og på din computer.
+Vi sidder en flok nørder og er klar til at hjælpe dig i gang med, at bruge nogle af de populære og anerkendte sikkerhedsværktøjer; både på din smartphone og på din computer med udgangspunkt i dit behov. Men alt det tager vi en snak om, når vi ses.
 
-Så kom ned og sig hej, drik en kop lækker kaffe, og få en sludder.
+## Hvem er det også for
+Cryptohagen er også et ’friendly community’ hvor der er plads til at vende tanker og idéer om privatliv, sikkerhed på nettet og kryptering – eller noget helt tredie.
 
-Det eneste, du skal have med er godt humør. Hvis du gerne vil have
-teknisk hjælp, så er du velkommen med din bærbare eller mobil!
+Så kom ned og sig hej, drik en kop lækker kaffe, og få en sludder. Det eneste, du skal have med er godt humør og ønsket om at lære nogle rare mennesker at kende i et afslappet miljø.
 
-[cryptoaarhus]:https://cryptoaarhus.dk
+## Kom i kontakt
+
+Vi har en [Twitterkonto][twitter]. Du er velkommen til, at skrive til os der. Vi er flere med adgang til kontoen, så vi vil sørge for at svare så hurtigt som muligt.
+
+
+[cryptoaarhus]:https://cryptoaarhus.dk
+[twitter]:https://twitter.com/cryptohagen

_sections/who_en.md

@@ -1,8 +1,7 @@
 # What is it
 
 ---
-Cryptohagen is a series of informal get-togethers every last Sunday
-of the month in Copenhagen.
+Cryptohagen is a series of informal get-togethers every last Sunday of the month in Copenhagen.
 
 There is a similar event in [Aarhus][cryptoaarhus]
 
@@ -11,21 +10,24 @@ There is a similar event in [Aarhus][cryptoaarhus]
 The meetup is for everyone who uses the Internet in one form or
 another.
 
-- You might be a student needing to research topics like Al-Quaeda,
-  ISIS and suicide bombing techniques
+- You might be studying and needing to research sensitive topics
 - Perhaps you live in a problematic relationship and need a way to
   get help without your partner being alerted
-- Are you an investigative journalist and need some tools to help
-  protect an important source?
-- Or maybe you're really the next Edward Snowden
+- You may be a journalist and need some tools to help
+  protect a source
+- Or maybe you're a future whistle blower
 
-We are a bunch of nerds who gather to help you get started using some
-of the popular and widely accepted security tools. Both on your
-computer and on your smartphone.
+We can all find ourselves in a situation where we need ways to protect our privacy. We are a friendly group of "nerds" who get together and are ready to start the conversation with you about how you can get better at protecting yourself online. We'll have a talk about your specific needs and come up with some ideas to help you get started.
 
-So come on down and say hi, have a chat and a nice cup of coffee.
+## What else is Cryptohagen
 
-All you need to bring is your good mood. If you would like technical
-help, you are more than welcome to bring your laptop or mobile device!
+Cryptohagen is also a friendly community that provides a space to discuss topics like privacy, online safety and security or encryption or any other subject among like-minded people. 
+
+So come on down and say hi, have a chat and a good cup of coffee. All you need to bring is a friendly smile and the wish to get to know some nice people in a relaxed environment.
+
+## Get in touch
+
+We have a [Twitter account][twitter]. Feel free to write us there, a few of us have access to it so we'll be sure to reply as soon as we can.
 
 [cryptoaarhus]:https://cryptoaarhus.dk/index_en.html
+[twitter]:https://twitter.com/cryptohagen