Merge branch 'main' into renovate/nixos-nix-2.x
This commit is contained in:
commit
5c6f73a1a5
4 changed files with 39 additions and 17 deletions
14
flake.lock
14
flake.lock
|
@ -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"
|
||||||
}
|
}
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue