kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Get rid of fediversity.enable

Browse source
This commit is contained in:
Nicolas Jeannerod 2025-02-14 20:08:01 +01:00
parent 78a85b27ff
commit a5d226ed22
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
6 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
deployment/flake-part.nix
View file

@ -80,7 +80,6 @@ in
{ pkgs, ... }: { pkgs, ... }:
{ {
fediversity = { fediversity = {
enable = true;
domain = "fedi101.abundos.eu"; domain = "fedi101.abundos.eu";
pixelfed = { pixelfed = {
enable = true; enable = true;
@ -97,7 +96,6 @@ in
{ pkgs, ... }: { pkgs, ... }:
{ {
fediversity = { fediversity = {
enable = true;
domain = "fedi102.abundos.eu"; domain = "fedi102.abundos.eu";
mastodon = { mastodon = {
enable = true; enable = true;
@ -116,7 +114,6 @@ in
{ pkgs, ... }: { pkgs, ... }:
{ {
fediversity = { fediversity = {
enable = true;
domain = "fedi103.abundos.eu"; domain = "fedi103.abundos.eu";
peertube = { peertube = {
enable = true; enable = true;

9
services/fediversity/default.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
let let
inherit (lib) mkOption mkEnableOption mkForce; inherit (lib) mkOption;
inherit (lib.types) types; inherit (lib.types) types;
in in
@ -15,8 +15,6 @@ in
options = { options = {
fediversity = { fediversity = {
enable = mkEnableOption "the collection of services bundled under Fediversity";
domain = mkOption { domain = mkOption {
type = types.str; type = types.str;
description = '' description = ''
@ -50,10 +48,5 @@ in
defaults.email = "nicolas.jeannerod+fediversity@moduscreate.com"; defaults.email = "nicolas.jeannerod+fediversity@moduscreate.com";
# defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory"; # defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory";
}; };
## NOTE: For a one-machine deployment, this removes the need to provide an
## `s3.garage.<domain>` domain. However, this will quickly stop working once
## we go to multi-machines deployment.
fediversity.garage.api.domain = mkForce "s3.garage.localhost";
}; };
} }

2
services/fediversity/garage/default.nix
View file

@ -99,7 +99,7 @@ in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = lib.mkIf config.fediversity.enable { config = {
environment.systemPackages = [ environment.systemPackages = [
pkgs.minio-client pkgs.minio-client
pkgs.awscli pkgs.awscli

2
services/fediversity/mastodon/default.nix
View file

@ -13,7 +13,7 @@ in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = lib.mkIf (config.fediversity.enable && config.fediversity.mastodon.enable) { config = lib.mkIf config.fediversity.mastodon.enable {
#### garage setup #### garage setup
fediversity.garage = { fediversity.garage = {
ensureBuckets = { ensureBuckets = {

2
services/fediversity/peertube/default.nix
View file

@ -7,7 +7,7 @@ in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf (config.fediversity.enable && config.fediversity.peertube.enable) { config = mkIf config.fediversity.peertube.enable {
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
80 80
443 443

2
services/fediversity/pixelfed/default.nix
View file

@ -12,7 +12,7 @@ in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf (config.fediversity.enable && config.fediversity.pixelfed.enable) { config = mkIf config.fediversity.pixelfed.enable {
fediversity.garage = { fediversity.garage = {
ensureBuckets = { ensureBuckets = {
pixelfed = { pixelfed = {