Compare commits

..

2 Commits

7 changed files with 8 additions and 101 deletions

View File

@ -1,3 +1,3 @@
---
authentik_version: 2024.12.1
authentik_version: 2024.10.5

View File

@ -45,10 +45,8 @@ services:
ports:
- "127.0.0.1:9000:9000"
depends_on:
postgresql:
condition: service_healthy
redis:
condition: service_healthy
- postgresql
- redis
worker:
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:{{ authentik_version }}
restart: unless-stopped
@ -73,7 +71,5 @@ services:
- ./certs:/certs
- ./custom-templates:/templates
depends_on:
postgresql:
condition: service_healthy
redis:
condition: service_healthy
- postgresql
- redis

View File

@ -294,26 +294,11 @@
"hostname": "cannelloni"
},
{
"hw-address": "7c:d9:5c:3f:ca:70",
"hostname": "cc-keller-video"
},
{
"hw-address": "54:60:09:f6:49:52",
"hostname": "cc-wohnzimmer-audio"
},
{
"hw-address": "30:fd:38:ce:5a:01",
"hostname": "cc-wohnzimmer-video"
},
{
"hw-address": "54:60:09:f4:da:1c",
"hostname": "cc-workshop-audio"
},
{
"hw-address": "b8:27:eb:1d:b9:bf",
"ip-address": "172.23.3.240",
@ -443,11 +428,6 @@
"hostname": "openhabgw1"
},
{
"hw-address": "40:f5:20:28:c7:9b",
"hostname": "wled-flux"
},
{
"hw-address": "08:f9:e0:e4:51:30",
"hostname": "wled-stairs"

View File

@ -28,20 +28,6 @@ autoconfig.binary-kitchen.de:
format: key
action: '/usr/sbin/service nginx restart'
door.binary-kitchen.de:
- path: /etc/nginx/ssl/door.binary-kitchen.de.crt
user: root
group: root
perm: '400'
format: crt,ca
action: '/usr/sbin/service nginx restart'
- path: /etc/nginx/ssl/door.binary-kitchen.de.key
user: root
group: root
perm: '400'
format: key
action: '/usr/sbin/service nginx restart'
www.ccc-r.de:
- path: /etc/nginx/ssl/www.ccc-r.de.crt
user: root

View File

@ -244,51 +244,3 @@ server {
default_type text/html;
}
server {
listen 80;
listen [::]:80;
server_name door.binary-kitchen.de;
location /.well-known/acme-challenge {
default_type "text/plain";
alias /var/www/acme-challenge;
}
location / {
return 301 https://door.binary-kitchen.de$request_uri;
}
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name door.binary-kitchen.de;
ssl_certificate_key /etc/nginx/ssl/door.binary-kitchen.de.key;
ssl_certificate /etc/nginx/ssl/door.binary-kitchen.de.crt;
root /var/www/kitchen-doorbot;
client_max_body_size 32M;
index index.php;
location / {
try_files $uri $uri/ @rewrite;
}
location @rewrite {
rewrite ^/(.*)$ /index.php?path=$1 last;
}
location ~ \.php(?:$|/) {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_pass unix:/var/run/php/php8.2-fpm-www.sock;
fastcgi_intercept_errors on;
}
}

View File

@ -3,7 +3,6 @@
- name: Install dependencies
apt:
name:
- php-curl
- php-fpm
- php-ldap
- php-sqlite3
@ -19,7 +18,6 @@
- eh21-fahrplan
- makerspace-regensburg
- kitchen
- kitchen-doorbot
- name: Ensure (BK) certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/www.binary-kitchen.de.key -out /etc/nginx/ssl/www.binary-kitchen.de.crt -days 730 -subj "/CN=www.binary-kitchen.de" creates=/etc/nginx/ssl/www.binary-kitchen.de.crt
@ -29,10 +27,6 @@
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/autoconfig.binary-kitchen.de.key -out /etc/nginx/ssl/autoconfig.binary-kitchen.de.crt -days 730 -subj "/CN=autoconfig.binary-kitchen.de" creates=/etc/nginx/ssl/autoconfig.binary-kitchen.de.crt
notify: Restart nginx
- name: Ensure (BK doorbot) certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/door.binary-kitchen.de.key -out /etc/nginx/ssl/door.binary-kitchen.de.crt -days 730 -subj "/CN=door.binary-kitchen.de" creates=/etc/nginx/ssl/door.binary-kitchen.de.crt
notify: Restart nginx
- name: Ensure (CCC-R) certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/www.ccc-r.de.key -out /etc/nginx/ssl/www.ccc-r.de.crt -days 730 -subj "/CN=www.ccc-r.de" creates=/etc/nginx/ssl/www.ccc-r.de.crt
notify: Restart nginx
@ -84,7 +78,6 @@
with_items:
- "www.binary-kitchen.de"
- "autoconfig.binary-kitchen.de"
- "door.binary-kitchen.de"
- "www.ccc-r.de"
- "www.makerspace-regensburg.de"
- "fahrplan.eh21.easterhegg.eu"

View File

@ -31,8 +31,8 @@ xrdp_applications:
salt: "{{ vault_xrdp_apphost_lightburn_salt }}"
git_config_folder: /home/lightburn/.config/LightBurn/
checksum: sha256:369eeccf3b3631e095324645631a516f311616486342075e056a83fdb9877c4a
version: 1.7.04
checksum: sha256:c366f542a32b93e2e0f9e9b03c3cba4dcedecbadec09d94a053c19dae2f69cc8
version: 1.5.03
Estlcam:
user: estlcam
@ -52,7 +52,7 @@ xrdp_applications:
version_base: 2.7.2
version: 2.7.2+linux-x64-GTK3-202402291307
lightburn_url: https://release.lightburnsoftware.com/LightBurn/Release/LightBurn-v{{ xrdp_applications.LightBurn.version }}/LightBurn-Linux64-v{{ xrdp_applications.LightBurn.version }}.run
lightburn_url: https://github.com/LightBurnSoftware/deployment/releases/download/{{ xrdp_applications.LightBurn.version }}/LightBurn-Linux64-v{{ xrdp_applications.LightBurn.version }}.run
lightburn_target: /home/{{ xrdp_applications.LightBurn.user }}/LightBurn-Linux64-v{{ xrdp_applications.LightBurn.version }}.run
slicer_url: https://github.com/prusa3d/PrusaSlicer/releases/download/version_{{ xrdp_applications.Slicer.version_base }}/PrusaSlicer-{{ xrdp_applications.Slicer.version }}.AppImage