Merge facelift in to main (#423)

* Burn down every bit! * First adaptions * First adaptions * Add first content * Create Verein.md * Update README.md * Update README.md * Change base url to / * Update _config.yml * Add smaller version of 01.jpg * Add old posts * Add new hero image * Add transparent favicon * Create CNAME * Update CNAME * Update CNAME * Delete CNAME * Create CNAME * Delete CNAME * Create CNAME * Update CNAME * Update CNAME * Update CNAME * Update CNAME * Update CNAME * Update CNAME * Update CNAME * Updated: Theme, configuration and posts * Added: Freie-netze.org CNAME * Readded: README.md * Updated: remote_theme * Removed: theme option * Update _config.yml * Fix some stuff * Fix video player * Fix Favicon * Update name of EMC * Merge pull request #314 from T0biii/add-inter.link add Inter.link * Fix setup instructions in README and remove Gemfile.lock * add privacy.md to header to facelift add privacy.md to header to facelift * Update _config.yml * Update 2024-03-09-neue-server-am-standort-muc.markdown (#389) (#390) * Update 2024-03-09-neue-server-am-standort-muc.markdown Changes as proposed Comprehensibility in the second sentence improved * Update 2024-03-09-neue-server-am-standort-muc.markdown Changes as proposed Comprehensibility in the second sentence improved Co-authored-by: defidoc <[email protected]> * Update 2024-03-09-neue-server-am-standort-muc.markdown (#389) (#392) * Update 2024-03-09-neue-server-am-standort-muc.markdown Changes as proposed Comprehensibility in the second sentence improved * Update 2024-03-09-neue-server-am-standort-muc.markdown Changes as proposed Comprehensibility in the second sentence improved Co-authored-by: defidoc <[email protected]> * Update 2024-03-09-neue-server-am-standort-muc.markdown (cherry picked from commit 35e2e24) * Update Article with Pics (cherry picked from commit 7d2b455) * add darf Article for VIE * [Backport facelift] add news for Firmware Bugfix (#399) * add news for Firmware Bugfix (cherry picked from commit f67855f) * update to Heading (cherry picked from commit 617c4ee) * add sugesstion (cherry picked from commit 9924b7b) --------- Co-authored-by: Tobias <[email protected]> * Update 2024-03-17-firmware-update.markdown (#401) (cherry picked from commit 655435e) Co-authored-by: Tobias <[email protected]> * [Backport facelift] Create 2024-03-19-freifunk-kostenlos.markdown (#404) * Create 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit f8ec631) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit 7c3a9e9) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit 1fe2a28) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit be9e86f) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit 8b4d238) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit b53ffcb) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit 68df3c0) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit e104b1f) * Update 2024-03-19-freifunk-kostenlos.markdown (cherry picked from commit f528cb2) --------- Co-authored-by: Annika Wickert <[email protected]> * backport all changes * Update 2024-03-19-freifunk-kostenlos.markdown (#406) (cherry picked from commit 360e714) Co-authored-by: Annika Wickert <[email protected]> * Update 2024-03-xx-wartungsarbeiten-neue-server-vie.markdown * Rename 2024-03-xx-wartungsarbeiten-neue-server-vie.markdown to 2024-03-26-wartungsarbeiten-neue-server-vie.markdown * Update 2024-03-26-wartungsarbeiten-neue-server-vie.markdown * update * add pics * ups false pic naming * Add Geplante Wartung * Update date to 09:00 so it gets generated * Info Post Firmware-Update (cherry picked from commit 9eb4ff3) * Remove Branch info nachdem Rollout auf Stable schon passiert ist. Ist dieser Satz obsolet geworden (cherry picked from commit 5f24290) * Update network-status.md (VIE DONE) (cherry picked from commit 2fffd96) * Update privacy.md (cherry picked from commit 3dd8500) * New theme initial commit * Set proper theme version * feat: new posts layout * fix: repository config * feat: new config * fix: Gemfile * fix: remote thene * feat: add new index.html * fix: remove theme from config * feat: footer with legal * feat: readd includes * [Backport facelift] Add Server News and more (#419) * Add Server News and more (cherry picked from commit ee18c37) * Update 2024-03-09-neue-server-am-standort-muc copy.markdown * Rename 2024-03-09-neue-server-am-standort-muc copy.markdown to 2024-04-06-neue-server-am-standort-vie.markdown --------- Co-authored-by: Tobias <[email protected]> Co-authored-by: Tobias <[email protected]> * [Backport facelift] add-LITA24 (#422) * add-LITA24 (cherry picked from commit 3120929) * fix hyperlink (cherry picked from commit f5d6172) * add line breaks and change link info (cherry picked from commit 93e2081) * Update 2024-04-19-linux-info-tag-augsburg-24.md --------- Co-authored-by: istrator² <[email protected]> Co-authored-by: Tobias <[email protected]> Co-authored-by: Tobias <[email protected]> * feat: update config * feat: header image * feat: opacity * feat: header updates * feat: update socials & legal * fix: header image * feat: opacity * feat: update legal icons * feat: chat in profile * fix: remove redundant information * feat: fix chat icon --------- Co-authored-by: Eduard Itrich <[email protected]> Co-authored-by: Seoman7 <[email protected]> Co-authored-by: Annika Wickert <[email protected]> Co-authored-by: awlx <[email protected]> Co-authored-by: Tobias <[email protected]> Co-authored-by: DasSkelett <[email protected]> Co-authored-by: Tobias <[email protected]> Co-authored-by: defidoc <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: istrator² <[email protected]> Co-authored-by: Tobias <[email protected]>
freifunkMUC · Apr 24, 2024 · b67618d · b67618d
1 parent 0d9aff3
commit b67618d
Show file tree

Hide file tree

Showing 146 changed files with 563 additions and 12,712 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-*.lock
 _site
-.jekyll-cache
 .bundle
-.gems
+.jekyll-cache
+.jekyll-metadata
+.sass-cache
+Gemfile.lock
diff --git a/404.html b/404.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>
diff --git a/CNAME b/CNAME
@@ -0,0 +1 @@
+www.freie-netze.org
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,41 @@
-source 'https://rubygems.org'
-gem 'github-pages'
-gem 'webrick'
+source "https://rubygems.org"
+
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 3.9.1"
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "github-pages", group: :jekyll_plugins
+gem "jekyll-include-cache", group: :jekyll_plugins
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-paginate"
+  gem "jekyll-sitemap"
+  gem "jekyll-gist"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+# and associated library.
+install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+  gem "tzinfo", "~> 1.2"
+  gem "tzinfo-data"
+end
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
+
+# kramdown v2 ships without the gfm parser by default. If you're using
+# kramdown v1, comment out this line.
+gem "kramdown-parser-gfm"
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
-[![Build Status](https://travis-ci.org/freifunkMUC/freifunkmuc.github.io.svg?branch=master)](https://travis-ci.org/freifunkMUC/freifunkmuc.github.io)
-
-Zu erreichen unter: https://ffmuc.net
+Basierend auf dem [minimal-mistakes](https://github.com/mmistakes/minimal-mistakes/) Theme. Erreichbar unter: https://freifunkmuc.github.io/
 
 Diese Webseite wird mit dem [jekyll](https://jekyllrb.com) compiler erstellt.
 
@@ -15,8 +13,7 @@ Zum lokalen testen sollte folgendes genügen:
 ```bash
 git clone https://github.com/freifunkMUC/freifunkmuc.github.io.git
 cd freifunkmuc.github.io
-bundle config set --local path '.gems'
-bundle install # install gem dependencies
+bundle install
 bundle exec jekyll serve
 ```
 

diff --git a/_config.yml b/_config.yml
@@ -1,23 +1,238 @@
-# Site settings
-title: Freifunk München
-email: 
-description: "Die nichtkommerzielle Initiative für den Aufbau freier (Funk-)Netzwerke in München"
-baseurl: ""
-url: "https://ffmuc.net/"
-twitter_username: FreifunkMUC
-github_username:  FreifunkMUC
-mastodon_username: "@freifunkMUC"
-mastodon_link: "https://social.ffmuc.net/"
-
-gems:
-  - jekyll-feed
-  - jekyll-seo-tag
-favicon: assets/favicon/favicon.ico
-# Build settings
+# Welcome to Jekyll!
+#
+# This config file is meant for settings that affect your entire site, values
+# which you are expected to set up once and rarely need to edit after that.
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# `jekyll serve`. If you change this file, please restart the server process.
+
+# Theme Settings
+#
+# Review documentation to determine if you should use `theme` or `remote_theme`
+# https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/#installing-the-theme
+
+#theme                  : "minimal-mistakes-jekyll"
+remote_theme           : "mmistakes/[email protected]"
+minimal_mistakes_skin    : "default" # "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum", "sunrise"
+
+# Site Settings
+locale                   : "de-DE"
+title                    : "Freifunk München"
+title_separator          : "-"
+subtitle                 : # site tagline that appears below site title in masthead
+name                     : "Freifunk München"
+description              : "An amazing website."
+url                      : "https://ffmuc.net"
+baseurl                  : # the subpath of your site, e.g. "/blog"
+repository               : "freifunkMUC/freifunkmuc.github.io"
+# breadcrumbs            : false # true, false (default)
+words_per_minute         : 200
+
+# If you want to generate website sitemap, you can set true
+sitemap: true
+# Site Author
+author:
+  name             : "Freie Netze München e.V."
+  email            : "[email protected]"
+  avatar           : "/assets/favicon/apple-touch-icon.png"
+  links:
+    - label: "Chat"
+      icon: "fas fa-fw fa-comment"
+      url: "https://chat.ffmuc.net"
+    - label: "X"
+      icon: "fab fa-fw fa-twitter-square"
+      url: "https://twitter.com/FreifunkMUC"
+    - label: "Facebook"
+      icon: "fab fa-fw fa-facebook-square"
+      url: "https://facebook.com/@freifunkMUC"
+    - label: "GitHub"
+      icon: "fab fa-fw fa-github"
+      url: "https://github.com/FreifunkMUC"
+    - label: "Mastodon"
+      icon: "fab fa-fw fa-mastodon"
+      url: "https://social.ffmuc.net/@freifunkMUC"
+
+# Site Footer
+footer:
+  links:
+    - label: "X"
+      icon: "fab fa-fw fa-twitter-square"
+      url: "https://twitter.com/FreifunkMUC"
+    - label: "Facebook"
+      icon: "fab fa-fw fa-facebook-square"
+      url: "https://facebook.com/@freifunkMUC"
+    - label: "GitHub"
+      icon: "fab fa-fw fa-github"
+      url: "https://github.com/FreifunkMUC"
+    - label: "Mastodon"
+      icon: "fab fa-fw fa-mastodon"
+      url: "https://social.ffmuc.net/@freifunkMUC"
+    - label: "Impressum"
+      icon: "fa fa-fw fa-book"
+      url: "/impressum"
+    - label: "Datenschutzerklärung"
+      icon: "fa fa-fw fa-book"
+      url: "/privacy"
+
+
+
+# Reading Files
+include:
+  - .htaccess
+  - _pages
+exclude:
+  - "*.sublime-project"
+  - "*.sublime-workspace"
+  - vendor
+  - .asset-cache
+  - .bundle
+  - .jekyll-assets-cache
+  - .sass-cache
+  - assets/js/plugins
+  - assets/js/_main.js
+  - assets/js/vendor
+  - Capfile
+  - CHANGELOG
+  - config
+  - Gemfile
+  - Gruntfile.js
+  - gulpfile.js
+  - LICENSE
+  - log
+  - node_modules
+  - package.json
+  - package-lock.json
+  - Rakefile
+  - README
+  - tmp
+  - /docs # ignore Minimal Mistakes /docs
+  - /test # ignore Minimal Mistakes /test
+keep_files:
+  - .git
+  - .svn
+encoding: "utf-8"
+markdown_ext: "markdown,mkdown,mkdn,mkd,md"
+
+
+# Conversion
 markdown: kramdown
-permalink: pretty
+highlighter: rouge
+lsi: false
+excerpt_separator: "\n\n"
+incremental: false
+
+
+# Markdown Processing
+kramdown:
+  input: GFM
+  hard_wrap: false
+  auto_ids: true
+  footnote_nr: 1
+  entity_output: as_char
+  toc_levels: 1..6
+  smart_quotes: lsquo,rsquo,ldquo,rdquo
+  enable_coderay: false
+
+
+# Sass/SCSS
+sass:
+  sass_dir: _sass
+  style: compressed # https://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
+
+
+# Outputting
+permalink: /:categories/:title/
+paginate: 5 # amount of posts to show
+paginate_path: /page:num/
+timezone: # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
+
+# Plugins (previously gems:)
+plugins:
+  - jekyll-paginate
+  - jekyll-sitemap
+  - jekyll-gist
+  - jekyll-feed
+  - jekyll-include-cache
+
+# mimic GitHub Pages with --safe
+whitelist:
+  - jekyll-paginate
+  - jekyll-sitemap
+  - jekyll-gist
+  - jekyll-feed
+  - jekyll-include-cache
+
+
+# Archives
+#  Type
+#  - GitHub Pages compatible archive pages built with Liquid ~> type: liquid (default)
+#  - Jekyll Archives plugin archive pages ~> type: jekyll-archives
+#  Path (examples)
+#  - Archive page should exist at path when using Liquid method or you can
+#    expect broken links (especially with breadcrumbs enabled)
+#  - <base_path>/tags/my-awesome-tag/index.html ~> path: /tags/
+#  - <base_path>/categories/my-awesome-category/index.html ~> path: /categories/
+#  - <base_path>/my-awesome-category/index.html ~> path: /
+category_archive:
+  type: liquid
+  path: /categories/
+tag_archive:
+  type: liquid
+  path: /tags/
+# https://github.com/jekyll/jekyll-archives
+# jekyll-archives:
+#   enabled:
+#     - categories
+#     - tags
+#   layouts:
+#     category: archive-taxonomy
+#     tag: archive-taxonomy
+#   permalinks:
+#     category: /categories/:name/
+#     tag: /tags/:name/
+
+
+# HTML Compression
+# - https://jch.penibelst.de/
+compress_html:
+  clippings: all
+  ignore:
+    envs: development
+
+teaser: /assets/banner.jpg
+logo: "/assets/favicon/apple-touch-icon.png"
+header:
+  image: /assets/banner.jpg
+  og_image: /assets/banner.jpg
+
+# Defaults
+defaults:
+  # _posts
+  - scope:
+      path: ""
+      type: posts
+    values:
+      layout: single
+      author_profile: true
+      read_time: true
+      comments: # true
+      share: true
+      related: true
+      show_date: true
+  - scope:
+      path: "_pages"
+      type: pages
+    values:
+      layout: single
+      author_profile: true
+head_scripts:
+  - https://code.jquery.com/jquery-3.7.1.min.js
+
+twitter:
+  username: "freifunkMUC"
 
+timezone: Europe/Berlin
 # Custom headers
 webrick:
   headers:
-      Content-Security-Policy: default-src 'none'; script-src 'unsafe-eval' 'unsafe-inline' 'self'  ; connect-src 'self' firmware.ffmuc.net; img-src 'self' cdn.rawgit.com raw.githubusercontent.com ; style-src 'self' 'unsafe-inline' 'unsafe-eval' ;    media-src 'self' ; font-src 'self'; frame-src 'self';
+      Content-Security-Policy: default-src 'none'; script-src 'unsafe-eval' 'unsafe-inline' 'self'  ; connect-src 'self' firmware.ffmuc.net; img-src 'self' cdn.rawgit.com raw.githubusercontent.com ; style-src 'self' 'unsafe-inline' 'unsafe-eval' ;    media-src 'self' ; font-src 'self'; frame-src 'self';
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -0,0 +1,11 @@
+main:
+  - title: "Mitmachen"
+    url: /mitmachen
+  - title: "Knotenkarte"
+    url: "https://map.ffmuc.net/"
+  - title: "Wiki"
+    url: "https://ffmuc.net/wiki"
+  - title: "Spenden"
+    url: "https://ffmuc.net/wiki/doku.php?id=ev:start"
+  - title: "Kontakt"
+    url: /kontakt