forgejo: migrate to reciproka.dev

resolves #17
This commit is contained in:
Fiscal Velvet Poet 2023-05-09 23:04:57 +10:00
parent 61b5205569
commit b5fc3737da
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
2 changed files with 16 additions and 8 deletions

View file

@ -1,4 +1,4 @@
# NixOS configuration for toscano # Nix configuration for toscano
# #
# https://en.wikipedia.org/wiki/Joseph_Toscano # https://en.wikipedia.org/wiki/Joseph_Toscano
{ {
@ -9,9 +9,9 @@
}: { }: {
imports = [ imports = [
../../../networks/linode.nix ../../../networks/linode.nix
../../../profiles/forgejo.nix
../../../profiles/hakyll-skeleton.nix ../../../profiles/hakyll-skeleton.nix
../../../profiles/jfdic-web.nix ../../../profiles/jfdic-web.nix
../../../profiles/reciproka-forgejo.nix
../../../profiles/resrok-web.nix ../../../profiles/resrok-web.nix
../../../profiles/tmateServer.nix ../../../profiles/tmateServer.nix
../../../profiles/voc-web.nix ../../../profiles/voc-web.nix

View file

@ -1,4 +1,4 @@
# NixOps configuration for the hosts running Forgejo # Nix configuration for the Reciproka Forgejo service
{ {
config, config,
pkgs, pkgs,
@ -11,13 +11,13 @@
in { in {
services.gitea = { services.gitea = {
enable = true; # Enable Forgejo enable = true; # Enable Forgejo
appName = "JFDI Collective: Forgejo Service"; # Give the site a name appName = "Reciproka Kolectiva: Forgejo Service"; # Give the site a name
database = { database = {
type = "postgres"; # Database type type = "postgres"; # Database type
passwordFile = config.age.secrets.forgejo.path; passwordFile = config.age.secrets.forgejo.path;
}; };
domain = "source.jfdic.org"; # Domain name domain = "reciproka.dev"; # Domain name
rootUrl = "https://source.jfdic.org/"; # Root web URL rootUrl = "https://reciproka.dev/"; # Root web URL
httpPort = 3002; # Provided unique port httpPort = 3002; # Provided unique port
package = forgejo; # a soft fork of gitea package = forgejo; # a soft fork of gitea
settings = let settings = let
@ -30,7 +30,7 @@ in {
in { in {
mailer = { mailer = {
ENABLED = true; ENABLED = true;
FROM = "source@jfdic.org"; FROM = "fonto@reciproka.dev";
}; };
repository = { repository = {
DEFAULT_BRANCH = "consensus"; DEFAULT_BRANCH = "consensus";
@ -91,6 +91,13 @@ in {
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts."source.jfdic.org" = { virtualHosts."source.jfdic.org" = {
enableACME = true; # Use ACME certs
forceSSL = true; # Force SSL
locations."/" = {
return = "301 https://reciproka.dev$request_uri";
};
};
virtualHosts."reciproka.dev" = {
# Forgejo hostname # Forgejo hostname
enableACME = true; # Use ACME certs enableACME = true; # Use ACME certs
forceSSL = true; # Force SSL forceSSL = true; # Force SSL
@ -101,7 +108,8 @@ in {
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
certs = { certs = {
"source.jfdic.org".email = "source@jfdic.org"; "reciproka.dev".email = "admin@reciproka.co";
"source.jfdic.org".email = "admin@reciproka.co";
}; };
}; };