back to working deploys
commented out impure parts of helix
This commit is contained in:
parent
9693a1e4f8
commit
244b67ebc6
|
@ -122,7 +122,7 @@
|
|||
};
|
||||
suites = with profiles; rec {
|
||||
base = [ core users.root users.anish ];
|
||||
sealight = [ base server rss-bridge gitea wireguard-server metrics sealight-website ]; # matrix backup
|
||||
sealight = [ base server wireguard-server metrics ]; # rss-bridge gitea sealight-website matrix backup
|
||||
mossnet = [ base server taskd shaarli wallabag dns monitoring nfs rss-bridge gonic headphones radicale seafile syncthing ]; # hpi sync.music
|
||||
cube = [ base site server ];
|
||||
graphical = [ base bluetooth music sync.kitaab sync.website sync.cal wifi desktop ];
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
{
|
||||
imports =
|
||||
[
|
||||
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
|
||||
# <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
|
|
|
@ -239,8 +239,8 @@
|
|||
enable = true;
|
||||
virtualHosts = {
|
||||
"sealight.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
#forceSSL = true;
|
||||
#enableACME = true;
|
||||
locations."/" = {
|
||||
root = "/var/www/sealight.xyz";
|
||||
};
|
||||
|
@ -253,8 +253,8 @@
|
|||
};
|
||||
## virtual host for Synapse
|
||||
"chat.sealight.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
#forceSSL = true;
|
||||
#enableACME = true;
|
||||
#useACMEHost = "sealight.xyz";
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:8448";
|
||||
|
@ -262,8 +262,8 @@
|
|||
};
|
||||
## virtual host for Riot/Web
|
||||
"element.sealight.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
#forceSSL = true;
|
||||
#enableACME = true;
|
||||
#useACMEHost = "sealight.xyz";
|
||||
## root points to the riot-web package content, also configured via Nix
|
||||
locations."/" = {
|
||||
|
@ -271,8 +271,8 @@
|
|||
};
|
||||
};
|
||||
${config.services.jitsi-meet.hostName} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
#enableACME = true;
|
||||
#forceSSL = true;
|
||||
};
|
||||
};
|
||||
## other nginx specific best practices
|
||||
|
|
|
@ -142,18 +142,18 @@
|
|||
};
|
||||
|
||||
services.loki = {
|
||||
enable = true;
|
||||
configFile = /var/loki-config.yaml;
|
||||
enable = false; # TODO
|
||||
#configFile = /var/loki-config.yaml;
|
||||
};
|
||||
|
||||
systemd.services.promtail = {
|
||||
description = "Promtail service for Loki";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
# systemd.services.promtail = {
|
||||
# description = "Promtail service for Loki";
|
||||
# wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.grafana-loki}/bin/promtail --config.file ${/var/promtail.yaml}
|
||||
'';
|
||||
};
|
||||
};
|
||||
# serviceConfig = {
|
||||
# ExecStart = ''
|
||||
# ${pkgs.grafana-loki}/bin/promtail --config.file ${/var/promtail.yaml}
|
||||
# '';
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
|
@ -6,6 +6,6 @@
|
|||
whitelist = [ "Facebook" "Bandcamp" "Twitter" "Telegram" "Instagram" "Reddit" ];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."bridge.sealight.xyz".forceSSL = true;
|
||||
services.nginx.virtualHosts."bridge.sealight.xyz".enableACME = true;
|
||||
#services.nginx.virtualHosts."bridge.sealight.xyz".forceSSL = true;
|
||||
#services.nginx.virtualHosts."bridge.sealight.xyz".enableACME = true;
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
vhost = {
|
||||
"sealight.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = "/var/www/sealight.xyz"
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
# services.nginx = {
|
||||
# enable = true;
|
||||
# virtualHosts = {
|
||||
# "sealight.xyz" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# locations."/" = {
|
||||
# root = "/var/www/sealight.xyz";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue