-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move from cactus to jekyll, add mastodon link, update footer year
- Loading branch information
Showing
50 changed files
with
385 additions
and
3,563 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,17 +13,10 @@ jobs: | |
| - uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v3 | ||
| with: | ||
| python-version: 3.8 | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install -r requirements.txt | ||
| - name: build website | ||
| run: | | ||
| cactus build | ||
| - name: Setup Pages | ||
| uses: actions/configure-pages@v3 | ||
| - name: Build | ||
| uses: actions/jekyll-build-pages@v1 | ||
| - name: deploy website | ||
| shell: bash | ||
| env: | ||
|
|
@@ -32,4 +25,4 @@ jobs: | |
| mkdir -p ~/.ssh | ||
| echo "${SSH_PRIVATE_KEY}" | base64 -d > ${HOME}/.ssh/deploy.id_rsa | ||
| chmod 700 ${HOME}/.ssh/deploy.id_rsa | ||
| rsync -azL -e "ssh -i ${HOME}/.ssh/deploy.id_rsa -o StrictHostKeyChecking=no" --delete --progress .build/ [email protected]:/var/www/vhosts/munichmakerlab.de/www/htdocs/ | ||
| rsync -azL -e "ssh -i ${HOME}/.ssh/deploy.id_rsa -o StrictHostKeyChecking=no" --delete --progress _site/ [email protected]:/var/www/vhosts/munichmakerlab.de/www/htdocs/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| .build | ||
| env* | ||
| *.pyc | ||
| _site | ||
| .sass-cache | ||
| .jekyll-cache | ||
| .jekyll-metadata | ||
| vendor | ||
| id_rsa* |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| --- | ||
| permalink: /404.html | ||
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| 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", "~> 4.3.2" | ||
| # This is the default theme for new Jekyll sites. You may change this to anything you like. | ||
| # gem "minima", "~> 2.5" | ||
| # 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.12" | ||
| end | ||
|
|
||
| # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem | ||
| # and associated library. | ||
| platforms :mingw, :x64_mingw, :mswin, :jruby do | ||
| gem "tzinfo", ">= 1", "< 3" | ||
| gem "tzinfo-data" | ||
| end | ||
|
|
||
| # Performance-booster for watching directories on Windows | ||
| gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] | ||
|
|
||
| # Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem | ||
| # do not have a Java counterpart. | ||
| gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| # Welcome to Jekyll! | ||
| # | ||
| # This config file is meant for settings that affect your whole blog, values | ||
| # which you are expected to set up once and rarely edit after that. If you find | ||
| # yourself editing this file very often, consider using Jekyll's data files | ||
| # feature for the data you need to update frequently. | ||
| # | ||
| # For technical reasons, this file is *NOT* reloaded automatically when you use | ||
| # 'bundle exec jekyll serve'. If you change this file, please restart the server process. | ||
| # | ||
| # If you need help with YAML syntax, here are some quick references for you: | ||
| # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml | ||
| # https://learnxinyminutes.com/docs/yaml/ | ||
| # | ||
| # Site settings | ||
| # These are used to personalize your new site. If you look in the HTML files, | ||
| # you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. | ||
| # You can create any custom variable you would like, and they will be accessible | ||
| # in the templates via {{ site.myvariable }}. | ||
|
|
||
| title: Munich Maker Lab | ||
| email: [email protected] | ||
| description: >- # this means to ignore newlines until "baseurl:" | ||
| Write an awesome description for your new site here. You can edit this | ||
| line in _config.yml. It will appear in your document head meta (for | ||
| Google search results) and in your feed.xml site description. | ||
| baseurl: "" # the subpath of your site, e.g. /blog | ||
| url: "https://munichmakerlab.de" # the base hostname & protocol for your site, e.g. http://example.com | ||
| #twitter_username: jekyllrb | ||
| #github_username: jekyll | ||
|
|
||
| # Build settings | ||
| #theme: minima | ||
| plugins: | ||
| - jekyll-feed | ||
|
|
||
| # Exclude from processing. | ||
| # The following items will not be processed, by default. | ||
| # Any item listed under the `exclude:` key here will be automatically added to | ||
| # the internal "default list". | ||
| # | ||
| # Excluded items can be processed by explicitly listing the directories or | ||
| # their entries' file path in the `include:` list. | ||
| # | ||
| # exclude: | ||
| # - .sass-cache/ | ||
| # - .jekyll-cache/ | ||
| # - gemfiles/ | ||
| # - Gemfile | ||
| # - Gemfile.lock | ||
| # - node_modules/ | ||
| # - vendor/bundle/ | ||
| # - vendor/cache/ | ||
| # - vendor/gems/ | ||
| # - vendor/ruby/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| layout: default | ||
| --- | ||
|
|
||
| <div class="row"> | ||
| <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> | ||
| {{ content }} | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| {% extends "base.html" %} | ||
|
|
||
| {% block title %}About Us{% endblock %} | ||
|
|
||
| {% block header_img %}{% static '/static/img/bg_make.png' %}{% endblock %} | ||
|
|
||
| {% block headline %}About Us{% endblock %} | ||
|
|
||
| {% block sub_headline %}What's the Munich Maker Lab?{% endblock %} | ||
|
|
||
| {% block content %} | ||
| --- | ||
| layout: page | ||
| title: About Us | ||
| header_image: /static/img/bg_make.png | ||
| headline: About Us | ||
| sub_headline: What's the Munich Maker Lab? | ||
| --- | ||
| <p>The Munich Maker Lab is a non-profit organization, creating an open community workspace, where you can learn, teach, share, make, hack, create, enjoy or simply relax. We try to create an environment that supports the do-it-yourself-, hacker-, and maker-culture by providing workspace, tools and infrastructure to our members and everyone else.</p> | ||
|
|
||
| <p><a href="statues.html">Our statues</a> and <a href="scaleoffees.html">our scale of fees</a></p> | ||
|
|
@@ -26,4 +22,3 @@ <h2 class="section-heading">Support us</h2> | |
| </blockquote> | ||
| Make sure to send us an email to <a href="mailto:[email protected]?subject=Donation">[email protected]</a>, so we can get you your receipt. | ||
| </p> | ||
| {% endblock %} | ||
Oops, something went wrong.