Update/fix keycloak, matrix, nextcloud, wireguard-nat-nftables
This commit is contained in:
		
					parent
					
						
							
								8c7f484512
							
						
					
				
			
			
				commit
				
					
						cf76804cec
					
				
			
		
					 6 changed files with 18 additions and 42 deletions
				
			
		| 
						 | 
				
			
			@ -1,8 +1,7 @@
 | 
			
		|||
{ nixpkgs-master-keycloak-23_0_7, ... }:
 | 
			
		||||
{ ... }:
 | 
			
		||||
{
 | 
			
		||||
  services.keycloak = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    package = nixpkgs-master-keycloak-23_0_7.legacyPackages."x86_64-linux".keycloak;
 | 
			
		||||
    settings = {
 | 
			
		||||
      hostname = "id.nekover.se";
 | 
			
		||||
      hostname-admin = "keycloak-admin.nekover.se";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,13 +47,6 @@
 | 
			
		|||
      turn_user_lifetime = 86400000;
 | 
			
		||||
      turn_allow_guests = true;
 | 
			
		||||
    };
 | 
			
		||||
    sliding-sync = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      settings = {
 | 
			
		||||
        SYNCV3_SERVER = config.services.matrix-synapse.settings.public_baseurl;
 | 
			
		||||
      };
 | 
			
		||||
      environmentFile = "/secrets/matrix-SYNCV3_SECRET.secret";
 | 
			
		||||
    };
 | 
			
		||||
    extras = [ "oidc" ];
 | 
			
		||||
    extraConfigFiles = [
 | 
			
		||||
      "/secrets/matrix-registration-shared-secret.secret"
 | 
			
		||||
| 
						 | 
				
			
			@ -62,4 +55,12 @@
 | 
			
		|||
      "/secrets/matrix-keycloak-client-secret.secret"
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  services.matrix-sliding-sync = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      settings = {
 | 
			
		||||
        SYNCV3_SERVER = config.services.matrix-synapse.settings.public_baseurl;
 | 
			
		||||
      };
 | 
			
		||||
      environmentFile = "/secrets/matrix-SYNCV3_SECRET.secret";
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,13 +2,12 @@
 | 
			
		|||
{
 | 
			
		||||
  services.nextcloud = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    package = pkgs.nextcloud28;
 | 
			
		||||
    package = pkgs.nextcloud29;
 | 
			
		||||
    hostName = "cloud.nekover.se";
 | 
			
		||||
    https = true;
 | 
			
		||||
    config = {
 | 
			
		||||
      dbtype = "pgsql";
 | 
			
		||||
      adminpassFile = "/secrets/nextcloud-adminpass.secret";
 | 
			
		||||
      defaultPhoneRegion = "DE";
 | 
			
		||||
    };
 | 
			
		||||
    database.createLocally = true;
 | 
			
		||||
    configureRedis = true;
 | 
			
		||||
| 
						 | 
				
			
			@ -17,7 +16,7 @@
 | 
			
		|||
      inherit bookmarks contacts calendar tasks twofactor_webauthn user_oidc;
 | 
			
		||||
    };
 | 
			
		||||
    maxUploadSize = "16G";
 | 
			
		||||
    extraOptions = {
 | 
			
		||||
    settings = {
 | 
			
		||||
      mail_smtpmode = "smtp";
 | 
			
		||||
      mail_sendmailmode = "smtp";
 | 
			
		||||
      mail_smtpsecure = "ssl";
 | 
			
		||||
| 
						 | 
				
			
			@ -28,6 +27,7 @@
 | 
			
		|||
      mail_smtphost = "mail-1.grzb.de";
 | 
			
		||||
      mail_smtpport = 465;
 | 
			
		||||
      mail_smtpname = "cloud@nekover.se";
 | 
			
		||||
      default_phone_region = "DE";
 | 
			
		||||
    };
 | 
			
		||||
    # Only contains mail_smtppassword
 | 
			
		||||
    secretFile = "/secrets/nextcloud-secretfile.secret";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue