cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

yurlls fix monitoring and use dehydrated certs

Browse source
This commit is contained in:
CroneKorkN 2025-06-29 14:46:39 +02:00
parent d3b8e2e414
commit 1d8f20ff25
Signed by: cronekorkn
SSH key fingerprint: SHA256:v0410ZKfuO1QHdgKBsdQNF64xmTxOF8osF1LIqwTcVw
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/nginx/metadata.py
View file

@ -96,7 +96,7 @@ def monitoring(metadata):
'monitoring': { 'monitoring': {
'services': { 'services': {
hostname: { hostname: {
'vars.command': f"/usr/bin/curl -X GET -L --fail --no-progress-meter -o /dev/null {quote(hostname + vhost.get('check_path', ''))}", 'vars.command': f"/usr/bin/curl -X GET -L --fail --no-progress-meter -o /dev/null {vhost.get('check_protocol', 'https')}://{quote(hostname + vhost.get('check_path', '/'))}",
} }
for hostname, vhost in metadata.get('nginx/vhosts').items() for hostname, vhost in metadata.get('nginx/vhosts').items()
}, },

1
bundles/yourls/metadata.py
View file

@ -36,6 +36,7 @@ def nginx(metadata):
'context': { 'context': {
'php_version': metadata.get('php/version'), 'php_version': metadata.get('php/version'),
}, },
'check_path': '/admin',
}, },
}, },
}, },

38
data/yourls/vhost.conf
View file

@ -1,28 +1,28 @@
server { server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
server_name ${server_name}; server_name ${server_name};
ssl_certificate /etc/letsencrypt/archive/${server_name}/fullchain1.pem; ssl_certificate /var/lib/dehydrated/certs/${server_name}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/archive/${server_name}/privkey1.pem; ssl_certificate_key /var/lib/dehydrated/certs/${server_name}/privkey.pem;
root /var/www/yourls/htdocs; root /var/www/yourls/htdocs;
location / { location / {
index index.php index.html index.htm; index index.php index.html index.htm;
try_files $uri $uri/ /yourls-loader.php$is_args$args; try_files $uri $uri/ /yourls-loader.php$is_args$args;
} }
location ~ \.php$ { location ~ \.php$ {
include params/fastcgi; include params/fastcgi;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_pass unix:/run/php/php${php_version}-fpm.sock; fastcgi_pass unix:/run/php/php${php_version}-fpm.sock;
} }
# temp # temp
location ^~ /.well-known/acme-challenge/ { location ^~ /.well-known/acme-challenge/ {
alias /var/www/certbot/; alias /var/www/certbot/;
} }
} }