v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

fix internal.xirion.net kubernetes resource naming

Browse source
This commit is contained in:
Vivian 2023-01-26 14:27:19 +01:00
parent f165ae5ffc
commit e9787c181b
4 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.lock
View file

@ -453,11 +453,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1674604320, "lastModified": 1674661101,
"narHash": "sha256-yhSiPmT3fmOaV2dLBNCsGGpN4t2Ucs6Q3dGygBH34sc=", "narHash": "sha256-iFFUngau5KHjsKScLhovpb7kCMjJvw/mXXOj6I62sVM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "12e293e3092b03dbb9d82e7a749f482ef2b7ea6e", "rev": "fc89e70a1fb74429ad0f772d399325f69e65b357",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -688,11 +688,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1672682641, "lastModified": 1674666581,
"narHash": "sha256-940TLvtdT8YKuP5nXcPhUfNeK0A/leSjjG8hfqvWM84=", "narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "30516cb2b01896e14ce66893e414b6e3eec71cac", "rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -800,16 +800,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1674556162, "lastModified": 1674459583,
"narHash": "sha256-X5b93+HMdyDqo+loT6Z7bIhaHUhSqVTw/T0lNrlZbvw=", "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "353e2d957c7421cae4e3ab42739a0997ea7e310f", "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable-small", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -9,7 +9,7 @@
# * https://github.com/Infinidoge/nix-minecraft # * https://github.com/Infinidoge/nix-minecraft
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs_22-11.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs_22-11.url = "github:nixos/nixpkgs/nixos-22.11";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";

18
flux/olympus/apps/websites/internal.yaml
View file

@ -4,31 +4,31 @@ metadata:
name: internal name: internal
namespace: websites namespace: websites
labels: labels:
app: internal.xirion.net app: internal
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
app: internal.xirion.net app: internal
template: template:
metadata: metadata:
labels: labels:
app: internal.xirion.net app: internal
spec: spec:
containers: containers:
- name: internal.xirion.net - name: internal
image: git.0x76.dev/v/internal.xirion.net:1 image: git.0x76.dev/v/internal:1
ports: ports:
- containerPort: 8080 - containerPort: 8080
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: internal.xirion.net name: internal
namespace: websites namespace: websites
spec: spec:
selector: selector:
app: internal.xirion.net app: internal
ports: ports:
- protocol: TCP - protocol: TCP
port: 8080 port: 8080
@ -36,7 +36,7 @@ spec:
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: internal.xirion.net name: internal
namespace: websites namespace: websites
spec: spec:
rules: rules:
@ -47,6 +47,6 @@ spec:
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: internal.xirion.net name: internal
port: port:
number: 8080 number: 8080

22
nixos/hosts/olympus/synapse/configuration.nix
View file

@ -54,6 +54,27 @@ in
]; ];
settings = settings =
let log_file = pkgs.writeText "log.yml" ''
version: 1
formatters:
structured:
class: synapse.logging.TerseJsonFormatter
handlers:
file:
class: logging.handlers.TimedRotatingFileHandler
formatter: structured
filename: /var/lib/matrix-synapse/synapse.log
when: midnight
backupCount: 3 # Does not include the current log file.
encoding: utf8
loggers:
synapse:
level: INFO
handlers: [file]
''; in
{ {
server_name = "meowy.tech"; server_name = "meowy.tech";
enable_registration = true; enable_registration = true;
@ -64,6 +85,7 @@ in
media_retention = { media_retention = {
remote_media_lifetime = "90d"; remote_media_lifetime = "90d";
}; };
log_config = "${log_file}";
listeners = [ listeners = [
{ {
inherit port; inherit port;