Compare commits
No commits in common. "4baeb59aaf00ba59c1ab02284153a7a4542f0c5d" and "78f66778119ab4c0663ee8f7c989377ec7c52749" have entirely different histories.
4baeb59aaf
...
78f6677811
|
@ -4,18 +4,11 @@ let
|
|||
"github:jrpotter/blog/457bfd6c521d5d8eeb41deb7d5d6a925fd55dda9";
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."blog.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = blog.packages.${system}.app;
|
||||
};
|
||||
services.nginx.virtualHosts."blog.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = blog.packages.${system}.app;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,19 +9,13 @@ let
|
|||
in
|
||||
{
|
||||
services = {
|
||||
nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."www.boardwise.gg" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "boardwise.gg" ];
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:4000";
|
||||
};
|
||||
nginx.virtualHosts."www.boardwise.gg" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "boardwise.gg" ];
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://127.0.0.1:4000";
|
||||
};
|
||||
};
|
||||
postgresql = {
|
||||
|
@ -48,9 +42,9 @@ in
|
|||
Type = "exec";
|
||||
EnvironmentFile = "/run/secrets/BOARDWISE_SECRET_KEY_BASE";
|
||||
ExecStartPre = "${boardwise}/bin/migrate";
|
||||
ExecStart = "${boardwise}/bin/server start";
|
||||
ExecStop = "${boardwise}/bin/server stop";
|
||||
ExecReload = "${boardwise}/bin/server restart";
|
||||
ExecStart = "${boardwise}/bin/boardwise start";
|
||||
ExecStop = "${boardwise}/bin/reconn stop";
|
||||
ExecReload = "${boardwise}/bin/reconn restart";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -4,18 +4,11 @@ let
|
|||
"github:jrpotter/bookshelf/bf9888c050b7a62f58be0198af19a6de7c40b375";
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."bookshelf.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = bookshelf.packages.${system}.app;
|
||||
};
|
||||
services.nginx.virtualHosts."bookshelf.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = bookshelf.packages.${system}.app;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -41,18 +41,12 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."git.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:3000";
|
||||
};
|
||||
nginx.virtualHosts."git.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://127.0.0.1:3000";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -4,19 +4,12 @@ let
|
|||
"github:jrpotter/notebook/79b715a64c703279f593cad08775b0d73400a19b";
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."notebook.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = "${notebook.packages.${system}.app}/share";
|
||||
tryFiles = "$uri $uri.html $uri/ =404";
|
||||
};
|
||||
services.nginx.virtualHosts."notebook.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = "${notebook.packages.${system}.app}/share";
|
||||
tryFiles = "$uri $uri.html $uri/ =404";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,19 +4,12 @@ let
|
|||
"github:jrpotter/portfolio/eca5e764f26faaa64f6966dbf3970b86eaaf2195";
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."www.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "jrpotter.com" ];
|
||||
locations."/" = {
|
||||
root = portfolio.packages.${system}.app;
|
||||
};
|
||||
services.nginx.virtualHosts."www.jrpotter.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "jrpotter.com" ];
|
||||
locations."/" = {
|
||||
root = portfolio.packages.${system}.app;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,25 +1,18 @@
|
|||
{ system, pkgs, lib, ... }:
|
||||
let
|
||||
reconn = (
|
||||
builtins.getFlake "git+ssh://forgejo@git.jrpotter.com/r/reconn?rev=42376b2060d00856ed3ea3e9ef9177ef6c7bca80"
|
||||
builtins.getFlake "git+https://git.jrpotter.com/r/reconn?rev=74cb0be878441c4eafcfd2b2c2c926fe87ea8a30"
|
||||
).packages.${system}.app;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
nginx = {
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."www.hideandseek.live" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "hideandseek.live" ];
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:4000";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
nginx.virtualHosts."www.hideandseek.live" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "hideandseek.live" ];
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://127.0.0.1:4000";
|
||||
};
|
||||
};
|
||||
postgresql = {
|
||||
|
@ -40,16 +33,15 @@ in
|
|||
after = [ "network.target" "postgresql.service" ];
|
||||
requires = [ "network-online.target" "postgresql.service" ];
|
||||
environment = {
|
||||
PHX_HOST = "hideandseek.live";
|
||||
DATABASE_URL = "ecto://postgres:postgres@localhost/reconn";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
EnvironmentFile = "/run/secrets/RECONN_SECRET_KEY_BASE";
|
||||
ExecStartPre = "${reconn}/bin/migrate";
|
||||
ExecStart = "${reconn}/bin/server start";
|
||||
ExecStop = "${reconn}/bin/server stop";
|
||||
ExecReload = "${reconn}/bin/server restart";
|
||||
ExecStart = "${reconn}/bin/reconn start";
|
||||
ExecStop = "${reconn}/bin/reconn stop";
|
||||
ExecReload = "${reconn}/bin/reconn restart";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue