changes
This commit is contained in:
@@ -191,19 +191,19 @@ function rp () {
|
||||
|
||||
if [[ "$host" == "mosatop" ]]
|
||||
then
|
||||
xfreerdp /u:"c2vi" /v:mosatop /p:$(cat $SECRETS_DIR/mosatop-rdp-password) /dynamic-resolution +clipboard +auto-reconnect /wm-class:"Microsoft Windows"
|
||||
xfreerdp3 /u:"c2vi" /v:mosatop /p:$(cat $SECRETS_DIR/mosatop-rdp-password) /dynamic-resolution +clipboard +auto-reconnect /wm-class:"Microsoft Windows"
|
||||
|
||||
elif [[ "$host" == "acern" ]]
|
||||
then
|
||||
xfreerdp /u:"seb" /v:acern /p:$(cat $SECRETS_DIR/acern-rdp-password) /dynamic-resolution +clipboard +auto-reconnect /wm-class:"Microsoft Windows"
|
||||
xfreerdp3 /u:"seb" /v:acern /p:$(cat $SECRETS_DIR/acern-rdp-password) /dynamic-resolution +clipboard +auto-reconnect /wm-class:"Microsoft Windows"
|
||||
|
||||
elif [[ "$host" == "mwin" ]]
|
||||
then
|
||||
xfreerdp /u:"me" /v:mac:4400 /p:$(cat $SECRETS_DIR/win-vm-pwd) /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows";
|
||||
xfreerdp3 /u:"me" /v:mac:4400 /p:$(cat $SECRETS_DIR/win-vm-pwd) /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows";
|
||||
|
||||
elif [[ "$host" == "win" ]]
|
||||
then
|
||||
xfreerdp /u:"me" /v:192.168.122.141 /p:$(cat $SECRETS_DIR/win-vm-pwd) /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows";
|
||||
xfreerdp3 /u:"me" /v:192.168.122.141 /p:$(cat $SECRETS_DIR/win-vm-pwd) /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows";
|
||||
|
||||
elif [[ "$host" == "phone" ]]
|
||||
then
|
||||
@@ -216,7 +216,7 @@ function rp () {
|
||||
|
||||
elif [[ "$host" == "fwin" ]]
|
||||
then
|
||||
xfreerdp /u:"me" /v:fusu:9002 /p:$(cat $SECRETS_DIR/win-vm-pwd) /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows";
|
||||
xfreerdp3 /u:"me" /v:fusu:9002 /p:$(cat $SECRETS_DIR/win-vm-pwd) /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows";
|
||||
|
||||
elif [[ "$host" == "ki" ]]
|
||||
then
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
|
||||
## non forwarded ports
|
||||
- 5000 compass-site
|
||||
- 5001 ppc-site
|
||||
|
||||
## me hosting ports
|
||||
- 8000 wiki site
|
||||
@@ -47,6 +46,8 @@
|
||||
- 8006 atproto pds http
|
||||
- 8007 mautrix-discord bridge appservice
|
||||
- 8008 vikunja todo (task.ppc.social)
|
||||
- 8009 oxi-cloud
|
||||
- 8010 ppc-site
|
||||
|
||||
## hosting container ips (on the interface br-proxy)
|
||||
- fusu 192.168.1.2
|
||||
@@ -88,6 +89,7 @@
|
||||
else if host == "pcmc" then "192.168.1.23"
|
||||
else if host == "ppc-hosting" then "192.168.1.21"
|
||||
else if host == "fesu" then "192.168.1.4"
|
||||
else if host == "fasu" then "192.168.1.22"
|
||||
else host;
|
||||
|
||||
in {
|
||||
@@ -300,7 +302,7 @@ in {
|
||||
description = "PPC Website";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "/root/host/ppc-src/target/release/ppc server";
|
||||
ExecStart = "/root/host/ppc-src/target/release/mize run";
|
||||
Restart = "always";
|
||||
};
|
||||
};
|
||||
@@ -466,7 +468,7 @@ in {
|
||||
{ name = "wiki-site"; domain = "wiki.ppc.social"; host = "me-hosting"; port = 8000; }
|
||||
{ name = "lage0-site"; domain = "lage0.c2vi.dev"; host = "me-hosting"; port = 8001; }
|
||||
{ name = "plausible"; domain = "plausible.c2vi.dev"; host = "me-hosting"; port = 8002; }
|
||||
{ name = "ppc-site"; domain = "ppc.social"; host = "fesu"; port = 5001; }
|
||||
{ name = "ppc-site"; domain = "ppc.social"; host = "ppc-hosting"; port = 8010; }
|
||||
{ name = "compass-site"; domain = "compass.ppc.social"; host = "fesu"; port = 5000; }
|
||||
{ name = "dav"; domain = "dav.ppc.social"; host = "ppc-hosting"; port = 8000; }
|
||||
{ name = "instant"; domain = "instant.ppc.social"; host = "me-hosting"; port = 8004; }
|
||||
@@ -477,6 +479,10 @@ in {
|
||||
{ name = "ppc-matrix"; domain = "matrix.ppc.social"; host = "ppc-hosting"; port = 8004; }
|
||||
{ name = "ppc-pds"; domain = "pds.ppc.social"; host = "ppc-hosting"; port = 8006; }
|
||||
{ name = "vikunja"; domain = "task.ppc.social"; host = "ppc-hosting"; port = 8008; }
|
||||
{ name = "oxi"; domain = "oxi.ppc.social"; host = "ppc-hosting"; port = 8009; }
|
||||
{ name = "c2vi-tunes"; domain = "tunes.c2vi.dev"; host = "fasu"; port = 8001; middlewares = [ "oidc-c2vi-navidrome" ]; }
|
||||
{ name = "c2vi-lidarr"; domain = "lidarr.c2vi.dev"; host = "fasu"; port = 8000; middlewares = [ "oidc-c2vi-lidarr" ]; }
|
||||
|
||||
#{ name = "spacetime"; domain = "spacetime.ppc.social"; host = "ppc-hosting"; port = 8005; extraRouterConfig = {
|
||||
# rule = "Host(`spacetime.ppc.social`) && PathPrefix(`/v1/database`)";
|
||||
# };
|
||||
@@ -499,6 +505,44 @@ in {
|
||||
sessionEncryptionKey = builtins.readFile "${secretsDir}/nico-session-encryption-key";
|
||||
logLevel = "debug";
|
||||
};
|
||||
middlewares.oidc-c2vi-navidrome.plugin.traefikoidc = {
|
||||
providerURL = "https://auth.ppc.social";
|
||||
callbackURL = "/oauth2/callback";
|
||||
clientSecret = builtins.readFile "${secretsDir}/navidrome-oidc-secret";
|
||||
clientID = "393371735229005827";
|
||||
scopes = [ "openid" "profile" "email" ];
|
||||
sessionEncryptionKey = builtins.readFile "${secretsDir}/navidrome-session-encryption-key";
|
||||
logLevel = "debug";
|
||||
headers = [
|
||||
{
|
||||
name = "X-Forwarded-Username";
|
||||
value = "{{`{{.Claims.preferred_username}}`}}";
|
||||
}
|
||||
{
|
||||
name = "X-Forwarded-Email";
|
||||
value = "{{`{{.Claims.email}}`}}";
|
||||
}
|
||||
];
|
||||
};
|
||||
middlewares.oidc-c2vi-lidarr.plugin.traefikoidc = {
|
||||
providerURL = "https://auth.ppc.social";
|
||||
callbackURL = "/oauth2/callback";
|
||||
clientSecret = builtins.readFile "${secretsDir}/lidarr-oidc-secret";
|
||||
clientID = "393374347726749699";
|
||||
scopes = [ "openid" "profile" "email" ];
|
||||
sessionEncryptionKey = builtins.readFile "${secretsDir}/lidarr-session-encryption-key";
|
||||
logLevel = "debug";
|
||||
headers = [
|
||||
{
|
||||
name = "X-Forwarded-Username";
|
||||
value = "{{`{{.Claims.preferred_username}}`}}";
|
||||
}
|
||||
{
|
||||
name = "X-Forwarded-Email";
|
||||
value = "{{`{{.Claims.email}}`}}";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user