Small tweaks, and trying to set up gotosocial
This commit is contained in:
		
							parent
							
								
									a20118c18a
								
							
						
					
					
						commit
						7168399e84
					
				
					 4 changed files with 86 additions and 24 deletions
				
			
		| 
						 | 
					@ -22,28 +22,27 @@
 | 
				
			||||||
    nginx = {
 | 
					    nginx = {
 | 
				
			||||||
      enableACME = true;
 | 
					      enableACME = true;
 | 
				
			||||||
      forceSSL = true;
 | 
					      forceSSL = true;
 | 
				
			||||||
      serverName = "akkoma.gladtherescake.eu";
 | 
					      serverName = "social.gladtherescake.eu";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    #dist.cookie._secret = config.sops.secrets."releaseCookie".path;
 | 
					    #dist.cookie._secret = config.sops.secrets."releaseCookie".path;
 | 
				
			||||||
    config = {};
 | 
					    config = {
 | 
				
			||||||
    # config = {
 | 
					      ":pleroma".":instance" = {
 | 
				
			||||||
    #   ":pleroma".":instance" = {
 | 
					        name = "GLaDTheresCake Akkoma";
 | 
				
			||||||
    #     name = "GLaDTheresCake Akkoma";
 | 
					        email = "akkoma@gladtherescake.eu";
 | 
				
			||||||
    #     email = "akkoma@gladtherescake.eu";
 | 
					        notify_email = "no-reply@akkoma.gladtherescake.eu";
 | 
				
			||||||
    #     notify_email = "no-reply@akkoma.gladtherescake.eu";
 | 
					        emails.mailer = {
 | 
				
			||||||
    #     emails.mailer = {
 | 
					          enabled = true;
 | 
				
			||||||
    #       enabled = true;
 | 
					          adapter = "Swoosh.Adapters.Sendmail";
 | 
				
			||||||
    #       adapter = "Swoosh.Adapters.Sendmail";
 | 
					          cmd_path = "sendmail";
 | 
				
			||||||
    #       cmd_path = "sendmail";
 | 
					          cmd_args = "-N delay,failure,success";
 | 
				
			||||||
    #       cmd_args = "-N delay,failure,success";
 | 
					          qmail = true;
 | 
				
			||||||
    #       qmail = true;
 | 
					        };
 | 
				
			||||||
    #     };
 | 
					        description = "Lillian's Akkoma server!";
 | 
				
			||||||
    #     description = "Lillian's Akkoma server!";
 | 
					        languages = ["en" "nl"];
 | 
				
			||||||
    #     languages = ["en" "nl"];
 | 
					        registrations_open = true;
 | 
				
			||||||
    #     registrations_open = true;
 | 
					        max_pinned_statuses = 10;
 | 
				
			||||||
    #     max_pinned_statuses = 10;
 | 
					        cleanup_attachments = true;
 | 
				
			||||||
    #     cleanup_attachments = true;
 | 
					      };
 | 
				
			||||||
    #   };
 | 
					    };
 | 
				
			||||||
    # };
 | 
					 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										44
									
								
								nixos/queen/gotosocial.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								nixos/queen/gotosocial.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,44 @@
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					  inputs,
 | 
				
			||||||
 | 
					  outputs,
 | 
				
			||||||
 | 
					  lib,
 | 
				
			||||||
 | 
					  config,
 | 
				
			||||||
 | 
					  pkgs,
 | 
				
			||||||
 | 
					  ...
 | 
				
			||||||
 | 
					}: {
 | 
				
			||||||
 | 
					  users.users.gotosocial.extraGroups = ["virtualMail"];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  services.nginx = {
 | 
				
			||||||
 | 
					    virtualHosts = {
 | 
				
			||||||
 | 
					      "social.gladtherescake.eu" = {
 | 
				
			||||||
 | 
					        forceSSL = true;
 | 
				
			||||||
 | 
					        enableACME = true;
 | 
				
			||||||
 | 
					        locations."/" = {
 | 
				
			||||||
 | 
					          proxyPass = "http://localhost:4257";
 | 
				
			||||||
 | 
					        };
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  services.gotosocial = {
 | 
				
			||||||
 | 
					    enable = true;
 | 
				
			||||||
 | 
					    setupPostgresqlDB = true;
 | 
				
			||||||
 | 
					    settings = {
 | 
				
			||||||
 | 
					      application-name = "gotosocial";
 | 
				
			||||||
 | 
					      host = "social.gladtherescake.eu";
 | 
				
			||||||
 | 
					      bind-address = "localhost";
 | 
				
			||||||
 | 
					      port = 4257;
 | 
				
			||||||
 | 
					      protocol = "https";
 | 
				
			||||||
 | 
					      storage-local-base-path = "/var/lib/gotosocial/storage";
 | 
				
			||||||
 | 
					      instance-languages = ["en-gb" "nl"];
 | 
				
			||||||
 | 
					      media-image-max-size = 41943040;
 | 
				
			||||||
 | 
					      media-video-max-size = 209715200;
 | 
				
			||||||
 | 
					      media-description-max-chars = 2000;
 | 
				
			||||||
 | 
					      smtp-host = "localhost";
 | 
				
			||||||
 | 
					      smtp-port = 587;
 | 
				
			||||||
 | 
					      smtp-username = "no-reply@social.gladtherescake.eu";
 | 
				
			||||||
 | 
					      smtp-password = config.sops.secrets."releaseCookie".path;
 | 
				
			||||||
 | 
					      smtp-from = "no-reply@social.gladtherescake.eu";
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,11 @@
 | 
				
			||||||
    enableImap = true;
 | 
					    enableImap = true;
 | 
				
			||||||
    enableSubmission = true;
 | 
					    enableSubmission = true;
 | 
				
			||||||
    fqdn = "mail.gladtherescake.eu";
 | 
					    fqdn = "mail.gladtherescake.eu";
 | 
				
			||||||
    domains = ["nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu"];
 | 
					    domains = [
 | 
				
			||||||
 | 
					      "nextcloud.gladtherescake.eu"
 | 
				
			||||||
 | 
					      "akkoma.gladtherescake.eu"
 | 
				
			||||||
 | 
					      "social.gladtherescake.eu"
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    loginAccounts = {
 | 
					    loginAccounts = {
 | 
				
			||||||
      "no-reply@nextcloud.gladtherescake.eu" = {
 | 
					      "no-reply@nextcloud.gladtherescake.eu" = {
 | 
				
			||||||
| 
						 | 
					@ -30,8 +34,15 @@
 | 
				
			||||||
      "no-reply@akkoma.gladtherescake.eu" = {
 | 
					      "no-reply@akkoma.gladtherescake.eu" = {
 | 
				
			||||||
        hashedPasswordFile = config.sops.secrets."mailpass".path;
 | 
					        hashedPasswordFile = config.sops.secrets."mailpass".path;
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
 | 
					      "no-reply@social.gladtherescake.eu" = {
 | 
				
			||||||
 | 
					        hashedPasswordFile = config.sops.secrets."mailpass".path;
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu"];
 | 
					    rejectRecipients = [
 | 
				
			||||||
 | 
					      "no-reply@nextcloud.gladtherescake.eu"
 | 
				
			||||||
 | 
					      "no-reply@akkoma.gladtherescake.eu"
 | 
				
			||||||
 | 
					      "no-reply@social.gladtherescake.eu"
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
    certificateScheme = "acme-nginx";
 | 
					    certificateScheme = "acme-nginx";
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -117,7 +117,15 @@
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  systemd.services."sops-nix.service" = {
 | 
					  systemd.services."sops-nix.service" = {
 | 
				
			||||||
    before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice-converter.service" "onlyoffice-docservice.service" "nginx.service" "phpfpm-nextcloud.service" "redis-nextcloud.service"];
 | 
					    before = [
 | 
				
			||||||
 | 
					      "nextcloud-setup.service"
 | 
				
			||||||
 | 
					      "postgresql.service"
 | 
				
			||||||
 | 
					      "onlyoffice-converter.service"
 | 
				
			||||||
 | 
					      "onlyoffice-docservice.service"
 | 
				
			||||||
 | 
					      "nginx.service"
 | 
				
			||||||
 | 
					      "phpfpm-nextcloud.service"
 | 
				
			||||||
 | 
					      "redis-nextcloud.service"
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Ensure that postgres is running before running the setup
 | 
					  # Ensure that postgres is running before running the setup
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue