Compare commits

..

2 commits

Author SHA1 Message Date
599cf0d16e
Merge branch 'service-crowdsec' into temp-caddy-crowdsec 2026-08-14 19:55:56 +03:00
6427ffd9c3
temp: Caddy 2026-08-14 18:27:41 +03:00
2 changed files with 13 additions and 11 deletions

View file

@ -159,20 +159,19 @@
plugins = [ plugins = [
"github.com/caddy-dns/cloudflare@v0.2.4" "github.com/caddy-dns/cloudflare@v0.2.4"
"github.com/WeidiDeng/caddy-cloudflare-ip@v0.0.0-20231130002422-f53b62aa13cb" "github.com/WeidiDeng/caddy-cloudflare-ip@v0.0.0-20231130002422-f53b62aa13cb"
"github.com/mholt/caddy-l4@v0.1.1" "github.com/mholt/caddy-l4@v0.1.2"
"github.com/caddyserver/transform-encoder@v0.0.0-20260423033309-ba4124974830" "github.com/caddyserver/transform-encoder@v0.0.0-20260423033309-ba4124974830"
"github.com/hslatman/caddy-crowdsec-bouncer/http@v0.13.1" "github.com/hslatman/caddy-crowdsec-bouncer/http@v0.14.1"
"github.com/hslatman/caddy-crowdsec-bouncer/appsec@v0.13.1" "github.com/hslatman/caddy-crowdsec-bouncer/appsec@v0.14.1"
"github.com/hslatman/caddy-crowdsec-bouncer/layer4@v0.13.1" "github.com/hslatman/caddy-crowdsec-bouncer/layer4@v0.14.1"
]; ];
hash = "sha256-ZDxfHEs0cj/qFrMqNOSVHjqugdTsjTgFWVo2eou5TD4="; hash = "sha256-5kC1Rcrgxco/26B4Tb6h7bictQ3j8rycxH+3Rr28Fa0=";
doInstallCheck = false; # Because caddy-crowdsec-bouncer plugins are in subdirectories doInstallCheck = false; # Because caddy-crowdsec-bouncer plugins are in subdirectories
}; };
environmentFile = config.sops.secrets."caddy.env".path; environmentFile = config.sops.secrets."caddy.env".path;
logFormat = '' logFormat = ''
level INFO level INFO
''; '';
logDir = ""; # Logs in journald
globalConfig = '' globalConfig = ''
grace_period 10s grace_period 10s
servers { servers {
@ -184,7 +183,7 @@
client_ip_headers Cf-Connecting-Ip X-Forwarded-For client_ip_headers Cf-Connecting-Ip X-Forwarded-For
} }
crowdsec { crowdsec {
api_url http://host.docker.internal:8080 api_url http://127.0.0.1:8080
api_key {$CROWDSEC_APIKEY} api_key {$CROWDSEC_APIKEY}
ticker_interval 10s ticker_interval 10s
} }
@ -203,7 +202,10 @@
''; '';
virtualHosts = { virtualHosts = {
"*.wekuz.localplayer.dev" = { "*.wekuz.localplayer.dev" = {
logFormat = null; logFormat = ''
output stdout
format json
'';
extraConfig = '' extraConfig = ''
tls { tls {
dns cloudflare {$CF_APIKEY} dns cloudflare {$CF_APIKEY}

View file

@ -1,7 +1,7 @@
vaultwarden.env: ENC[AES256_GCM,data:PLNb5cFoJaOyUo5U/gpXH0RGVwwQxL3kCE/OLw7MaLWazuBGHIPUEhH+kDMP2cfF916D63w8Ddgb/oH+lHGCw235YwgoqZ9yjWYPG4VB2Jdw+17LeCbirdh3zv8nNzFnSZDJmhz5Pj82+iswju6sYO/H7UfZ3aeASWonKW9LGHVltKSY1rAVhZRu4SvhqPiAxNpEzN0/EDTl46RIxrgEoUraN+Ie8fh1wU9SKevExkPU3NXGO1gG2tWRxclMPgc=,iv:es40/5HpBAhOy2xmU/yCUD43fVVsAXk6qJ3OasKjK3U=,tag:bneErU9pPZkQ2VzbQ1NrJA==,type:str] vaultwarden.env: ENC[AES256_GCM,data:PLNb5cFoJaOyUo5U/gpXH0RGVwwQxL3kCE/OLw7MaLWazuBGHIPUEhH+kDMP2cfF916D63w8Ddgb/oH+lHGCw235YwgoqZ9yjWYPG4VB2Jdw+17LeCbirdh3zv8nNzFnSZDJmhz5Pj82+iswju6sYO/H7UfZ3aeASWonKW9LGHVltKSY1rAVhZRu4SvhqPiAxNpEzN0/EDTl46RIxrgEoUraN+Ie8fh1wU9SKevExkPU3NXGO1gG2tWRxclMPgc=,iv:es40/5HpBAhOy2xmU/yCUD43fVVsAXk6qJ3OasKjK3U=,tag:bneErU9pPZkQ2VzbQ1NrJA==,type:str]
rsyncd.secrets: ENC[AES256_GCM,data:VjHRoZa6/lDtCheKSJyM,iv:kxygNaKOuK0iH/bFY/uKxcbMcYSR8nWDUx+4aDNqTMk=,tag:uYYPWAPCWtvLLGwmOWyH+A==,type:str] rsyncd.secrets: ENC[AES256_GCM,data:VjHRoZa6/lDtCheKSJyM,iv:kxygNaKOuK0iH/bFY/uKxcbMcYSR8nWDUx+4aDNqTMk=,tag:uYYPWAPCWtvLLGwmOWyH+A==,type:str]
caddy.env: ENC[AES256_GCM,data:xzYvGvtu1DDBWvcLmohHUAOTNQfUuLbOJ18UPgLokkWlzf7peNgN3Qt9A/ZCuEm5cg4PLtJy0LYbWk6ykm20vgDW+TmouJ8dxqwSDvJHdmnhoPYCfu0KA1d3iHPL5f8unqXxxhAbcfp0VSzxUo685on9Aw==,iv:E+o8dJ+t4BPuoiEfkTaOO6lVDAZnG9D1btNYN9oX3ek=,tag:oar1at1PkK4tgIDIXCyXrg==,type:str] caddy.env: ENC[AES256_GCM,data:xzYvGvtu1DDBWvcLmohHUAOTNQfUuLbOJ18UPgLokkWlzf7peNgN3Qt9A/ZCuEm5cg4PLtJy0LYbWk6ykm20vgDW+TmouJ8dxqwSDvJHdmnhoPYCfu0KA1d3iHPL5f8unqXxxhAbcfp0VSzxUo685on9Aw==,iv:E+o8dJ+t4BPuoiEfkTaOO6lVDAZnG9D1btNYN9oX3ek=,tag:oar1at1PkK4tgIDIXCyXrg==,type:str]
crowdsec-console-token: ENC[AES256_GCM,data:kW0ztvpScqEDYeD++0StmzWfKuHzPwXnDEk=,iv:jwNBiPdJb4pfQ4cpheNfum0b5U0udvokp919sS7S6T8=,tag:yvGumTuO54rxsWYekn3pqw==,type:str] crowdsec-console-token: ENC[AES256_GCM,data:0K2kGXAf7uPhSRSRBIQ5cWjtp9l5oEcCSJg=,iv:O11ZhGU3bM+Ao5IUW0/sKT3L0CTeMsRpJTrCya6T674=,tag:R064lQrFBAIi33N4YVB/5Q==,type:str]
sops: sops:
age: age:
- enc: | - enc: |
@ -13,7 +13,7 @@ sops:
hkLDjoWK9dkGRX8kqRd028cuMCQRenLpULEECWp6oV+evUdMf7wRtg== hkLDjoWK9dkGRX8kqRd028cuMCQRenLpULEECWp6oV+evUdMf7wRtg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
recipient: age1sqssntfzzlhcgp0wuf9wmeavg0hmwmq349npsq8vaxj9sxey5s9ssc82sw recipient: age1sqssntfzzlhcgp0wuf9wmeavg0hmwmq349npsq8vaxj9sxey5s9ssc82sw
lastmodified: "2026-08-06T14:05:17Z" lastmodified: "2026-08-14T15:56:25Z"
mac: ENC[AES256_GCM,data:gbJ9sZHAsqHJQYgQdH70qi8w7YapJr7hc4xoXXAy8ZMNDMau7aJhF0Q2wTdADulkqbp3UZYwX3CMvyA9O/T46zdaLqADindJb1QDPjliR7ZuqWupWKgVaJOUenzKBiM0MM3PR58K2AWcGSnLjk9R8TMatbuMSQ50rJJHBcuKww4=,iv:/1ic2pKvamUpwsqFIhpyjVhIZClQH/nzSlOGJ2n2YHk=,tag:44ZZ6o/tNBwlG2wXtUFXyQ==,type:str] mac: ENC[AES256_GCM,data:Y0rf6PzXBXgV4J8Zjs73L3Fvl96o/AMFXAqe/FN3w68yIbKvClDegiF2V5SQwpYchcr7xN9Qxwcl+5/OnF6wIoyOa4b94xmwd1ZKMU4MM2omFaT5mUov0lW26PkAGbB8ioMiCjibdXHnFVJMKHYO2cuMfTo3YH1nOUMuQvCQGyg=,iv:aatrE+/Wa5VGHVswrkh6PBkoCi19FBttVJJXZ/JG2+Q=,tag:KAk6sk5NmdB6nwx493hUQw==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.13.3 version: 3.13.3