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

prep outline

Browse source
This commit is contained in:
Vivian 2022-09-20 16:38:57 +02:00
parent f23437064d
commit 87dcf54829
4 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -384,11 +384,11 @@
"wlroots": "wlroots" "wlroots": "wlroots"
}, },
"locked": { "locked": {
"lastModified": 1663665418, "lastModified": 1663672654,
"narHash": "sha256-FfHLjo7Cz1U0GRKaGwmBOrbv25LhFfKXkLaJ/PCelHY=", "narHash": "sha256-AGaTUx0YCCzDfizsZnE7R6GqLwSKo7GF1/jkOrqIk1c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "cde624ec6a98b751e67967cbaffd68b1215e8531", "rev": "2dd1661aec80f216a53b897be11ab72611447247",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -583,16 +583,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1663494472, "lastModified": 1663683373,
"narHash": "sha256-fSowlaoXXWcAM8m9wA6u+eTJJtvruYHMA+Lb/tFi/qM=", "narHash": "sha256-TnMwg3MLwUecBjT2SM9CKLqEODG9vfjvDK7qNTGDJJs=",
"owner": "NixOS", "owner": "NULLx76",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f677051b8dc0b5e2a9348941c99eea8c4b0ff28f", "rev": "167edcba5042e9e6099844cbef2cae3c1c2b3170",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NULLx76",
"ref": "nixos-unstable", "ref": "0x76",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

6
flake.nix
View file

@ -6,7 +6,7 @@
# * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NULLx76/nixpkgs/0x76";
colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena";
colmena.inputs.nixpkgs.follows = "nixpkgs"; colmena.inputs.nixpkgs.follows = "nixpkgs";
@ -113,8 +113,8 @@
nixfmt nixfmt
nixUnstable nixUnstable
vault vault
# (vault-push-approle-envs self) (vault-push-approle-envs self {})
# (vault-push-approle-approles self) (vault-push-approles self {})
]; ];
}; };
}; };

1
nixos/hosts/olympus/nginx/configuration.nix
View file

@ -56,6 +56,7 @@ in
virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000"; virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000";
virtualHosts."o.0x76.dev" = proxy "http://minio.olympus:9000"; virtualHosts."o.0x76.dev" = proxy "http://minio.olympus:9000";
virtualHosts."grafana.0x76.dev" = proxy "http://victoriametrics.olympus:2342"; virtualHosts."grafana.0x76.dev" = proxy "http://victoriametrics.olympus:2342";
virtualHosts."outline.0x76.dev" = proxy "http://outline.olympus:3000";
virtualHosts."andreea.redshifts.xyz" = proxy "http://zmeura.olympus:8008"; virtualHosts."andreea.redshifts.xyz" = proxy "http://zmeura.olympus:8008";
# Meow # Meow

26
nixos/hosts/olympus/outline/configuration.nix
View file

@ -3,7 +3,7 @@
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { config, pkgs, ... }:
let vs = config.vault-secrets.secrets; in
{ {
imports = [ ]; imports = [ ];
@ -18,5 +18,27 @@
# Additional packages # Additional packages
environment.systemPackages = with pkgs; [ ]; environment.systemPackages = with pkgs; [ ];
networking.firewall.allowedTCPPorts = [ ]; networking.firewall.allowedTCPPorts = [
config.services.outline.port
];
vault-secrets.secrets.outline = { };
services.outline = {
enable = false;
concurrency = 1;
port = 3000;
redisUrl = "local";
databaseUrl = "local";
publicUrl = "https://outline.0x76.dev";
utilsSecretFile = "${vs.outline}/utilsSecret";
secretKeyFile = "${vs.outline}/secretKey";
storage = {
accessKey = "outline";
secretKeyFile = "${vs.outline}/s3key";
uploadBucketUrl = "https://o.0x76.dev";
uploadBucketName = "outline";
region = "us-east-1"; # fake
};
};
} }