Compare commits

..

1 Commits

Author SHA1 Message Date
dfcdd9c1c6 xrdp_apphost: Upgrade LightBurn from 1.5.03 to 1.7.04 2024-12-22 14:00:13 +01:00
11 changed files with 18 additions and 88 deletions

View File

@ -64,5 +64,6 @@ Currently the following hosts are installed:
| palladium.binary-kitchen.net | Debian 12 | Event pretalx | | palladium.binary-kitchen.net | Debian 12 | Event pretalx |
| argentum.binary-kitchen.net | Debian 12 | Event Web * | | argentum.binary-kitchen.net | Debian 12 | Event Web * |
| cadmium.binary-kitchen.net | Debian 12 | Event NetBox * | | cadmium.binary-kitchen.net | Debian 12 | Event NetBox * |
| indium.binary-kitchen.net | Debian 12 | Igel CAM * |
\*: The main application is not managed by ansible but manually installed \*: The main application is not managed by ansible but manually installed

1
hosts
View File

@ -39,3 +39,4 @@ ruthenium.binary-kitchen.net
rhodium.binary-kitchen.net rhodium.binary-kitchen.net
argentum.binary-kitchen.net argentum.binary-kitchen.net
cadmium.binary-kitchen.net cadmium.binary-kitchen.net
indium.binary-kitchen.net

View File

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

View File

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

View File

@ -0,0 +1,5 @@
---
dependencies:
- { role: acertmgr }
- { role: nginx, nginx_ssl: True }

View File

@ -0,0 +1 @@
---

View File

@ -294,11 +294,6 @@
"hostname": "cannelloni" "hostname": "cannelloni"
}, },
{
"hw-address": "30:fd:38:ce:5a:01",
"hostname": "cc-wohnzimmer-video"
},
{ {
"hw-address": "b8:27:eb:1d:b9:bf", "hw-address": "b8:27:eb:1d:b9:bf",
"ip-address": "172.23.3.240", "ip-address": "172.23.3.240",
@ -426,11 +421,6 @@
"hw-address": "dc:a6:32:bf:e2:3e", "hw-address": "dc:a6:32:bf:e2:3e",
"ip-address": "172.23.4.251", "ip-address": "172.23.4.251",
"hostname": "openhabgw1" "hostname": "openhabgw1"
},
{
"hw-address": "08:f9:e0:e4:51:30",
"hostname": "wled-stairs"
} }
] ]
}, },

View File

@ -28,20 +28,6 @@ autoconfig.binary-kitchen.de:
format: key format: key
action: '/usr/sbin/service nginx restart' 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: www.ccc-r.de:
- path: /etc/nginx/ssl/www.ccc-r.de.crt - path: /etc/nginx/ssl/www.ccc-r.de.crt
user: root user: root

View File

@ -244,51 +244,3 @@ server {
default_type text/html; 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 - name: Install dependencies
apt: apt:
name: name:
- php-curl
- php-fpm - php-fpm
- php-ldap - php-ldap
- php-sqlite3 - php-sqlite3
@ -19,7 +18,6 @@
- eh21-fahrplan - eh21-fahrplan
- makerspace-regensburg - makerspace-regensburg
- kitchen - kitchen
- kitchen-doorbot
- name: Ensure (BK) certificates are available - 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 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 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 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 - 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 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 notify: Restart nginx
@ -84,7 +78,6 @@
with_items: with_items:
- "www.binary-kitchen.de" - "www.binary-kitchen.de"
- "autoconfig.binary-kitchen.de" - "autoconfig.binary-kitchen.de"
- "door.binary-kitchen.de"
- "www.ccc-r.de" - "www.ccc-r.de"
- "www.makerspace-regensburg.de" - "www.makerspace-regensburg.de"
- "fahrplan.eh21.easterhegg.eu" - "fahrplan.eh21.easterhegg.eu"

View File

@ -158,6 +158,11 @@
roles: roles:
# - netbox # - netbox
- name: Setup igelcam server
hosts: indium.binary-kitchen.net
roles:
- indium_dummy
- name: Setup event web server - name: Setup event web server
hosts: argentum.binary-kitchen.net hosts: argentum.binary-kitchen.net
roles: roles: