Compare commits

..

2 Commits

Author SHA1 Message Date
12cca8fbe3 Merge branch 'master' into master 2023-08-28 16:05:02 +00:00
71dae55ccd site/content/unterstuetzer.md aktualisiert
ich habe die SEG einmal zu unseren Sponsoren nach oben geschoben. Die haben uns für dieses Jahr ja ordentlich gesponsert. So steht wenigstens einer von Niederkassel auch bei den Förderern/ Sponsoren. Der Vorsitzende hatte mir auch telefonisch gesagt, dass die uns im nächsten Jahr auch gern wieder sponsern würden.
2023-08-28 15:50:11 +00:00
150 changed files with 64 additions and 74 deletions

1
.gitignore vendored
View File

@ -125,4 +125,3 @@ fabric.properties
# End of https://www.gitignore.io/api/ruby,jekyll,webstorm
.DS_Store

View File

@ -1,31 +1,38 @@
---
platform: linux/arm64
pipeline:
docker:
image: woodpeckerci/plugin-docker-buildx
settings:
platforms: linux/amd64
registry: git.freifunk-rhein-sieg.net
repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
username:
from_secret: gitea_user
password:
from_secret: gitea_token
tags: latest
when:
- branch: master
kind: pipeline
name: website build
docker-devel:
image: woodpeckerci/plugin-docker-buildx
settings:
platforms: linux/amd64
registry: git.freifunk-rhein-sieg.net
repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
username:
from_secret: gitea_user
password:
from_secret: gitea_token
tags: devel
when:
- branch: devel
steps:
- name: docker
image: woodpeckerci/plugin-docker-buildx
settings:
platforms: linux/amd64
registry: git.freifunk-rhein-sieg.net
repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
username:
from_secret: gitea_user
password:
from_secret: gitea_token
tags: latest
#
#- name: publish Website
# image: appleboy/drone-ssh
# settings:
# host: freifunk-rhein-sieg.net
# port: 22
# username: dronebot
# password:
# from_secret: ffrs_server_password
# script:
# - cd /opt/docker/ffrs-website-docker-compose/
# - docker-compose pull
# - docker-compose up -d
#
#- name: slack
# image: plugins/slack
# settings:
# webhook:
# from_secret: slack_webhook
# channel: z_rhein-sieg-website

View File

@ -1,4 +1,4 @@
FROM klakegg/hugo:0.64.0-onbuild AS builder
FROM monachus/hugo:v0.64.0 AS builder
FROM nginx:1.25.2-alpine
COPY --from=builder /target /usr/share/nginx/html
FROM nginx:1.17.6-alpine
COPY --from=builder /usr/share/nginx/html /usr/share/nginx/html

View File

@ -1,30 +0,0 @@
---
title: "Kontakt"
date: 2020-02-10T17:19:33+01:00
draft: false
---
# Kontakt
## per E-Mail im Ticket Sytem
<button id="zammad-feedback-form">Feedback</button>
<script id="zammad_form_script" src="https://support.freifunk-rhein-sieg.net/assets/form/form.js"></script>
<script>
$(function() {
$('#zammad-feedback-form').ZammadForm({
messageTitle: 'Feedback-Formular',
messageSubmit: 'Übermitteln',
messageThankYou: 'Vielen Dank für Ihre Anfrage (#%s). Wir melden uns umgehend.',
modal: true
});
});
</script>
## Community Treffen
Wir treffen und Monatlich in der AWO Troisdorf Mitte. Die aktuellen Termine findest du auf der Webseite der Community Troisdorf:
[Freifunk Treffen](https://freifunk-troisdorf.de/kontakt_treffen/)

17
site/content/kontakt.md Normal file
View File

@ -0,0 +1,17 @@
---
title: "Kontakt"
date: 2020-02-10T17:19:33+01:00
draft: false
---
# Kontakt
## per E-Mail im Ticket Sytem
E-Mail/Ticket: [Ticket System](https://tickets.freifunk-rhein-sieg.net/open.php)
## Community Treffen
Wir treffen und Monatlich in der AWO Troisdorf Mitte. Die aktuellen Termine findest du auf der Webseite der Community Troisdorf:
[Freifunk Treffen](https://freifunk-troisdorf.de/kontakt_treffen/)

View File

@ -2,7 +2,6 @@
title: "Über uns"
date: 2019-03-09T20:16:47+01:00
url: /
permalink: "/ueber_uns/"
draft: false
---

View File

@ -23,3 +23,4 @@ draft: false
{{< sponsor img="/logo_ffrl.svg" alt="Logo Freifunk Rheinland" link="http://freifunk-rheinland.net" >}}
{{< sponsor img="/logo_trowista.jpg" alt="Logo Trowista GmbH" link="http://trowista.de" >}}
{{< sponsor img="/logo_staatskanzlei_nrw.svg" alt="Logo Staatskanzlei NRW" link="https://www.land.nrw/de/landesregierung/ministerpraesident/staatskanzlei" >}}

View File

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 1021 B

View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

View File

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 109 KiB

View File

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

View File

Before

Width:  |  Height:  |  Size: 385 KiB

After

Width:  |  Height:  |  Size: 385 KiB

View File

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 162 KiB

View File

Before

Width:  |  Height:  |  Size: 564 B

After

Width:  |  Height:  |  Size: 564 B

View File

Before

Width:  |  Height:  |  Size: 963 B

After

Width:  |  Height:  |  Size: 963 B

Some files were not shown because too many files have changed in this diff Show More