phantom: move from .xyz to .com
This commit is contained in:
		
							parent
							
								
									de26e20ed4
								
							
						
					
					
						commit
						0f10937be8
					
				
					 7 changed files with 20 additions and 13 deletions
				
			
		| 
						 | 
					@ -14,7 +14,7 @@
 | 
				
			||||||
    ./forgejo.nix
 | 
					    ./forgejo.nix
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.nginx.virtualHosts."lelgenio.xyz" = {
 | 
					  services.nginx.virtualHosts."lelgenio.com" = {
 | 
				
			||||||
    enableACME = true;
 | 
					    enableACME = true;
 | 
				
			||||||
    forceSSL = true;
 | 
					    forceSSL = true;
 | 
				
			||||||
    root = pkgs.runCommand "www-dir" { } ''
 | 
					    root = pkgs.runCommand "www-dir" { } ''
 | 
				
			||||||
| 
						 | 
					@ -50,7 +50,7 @@
 | 
				
			||||||
    dates = "04:40";
 | 
					    dates = "04:40";
 | 
				
			||||||
    operation = "switch";
 | 
					    operation = "switch";
 | 
				
			||||||
    flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ];
 | 
					    flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ];
 | 
				
			||||||
    flake = "git+https://git.lelgenio.xyz/lelgenio/nixos-config#phantom";
 | 
					    flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  system.stateVersion = "23.05"; # Never change this
 | 
					  system.stateVersion = "23.05"; # Never change this
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,20 +8,27 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  mailserver = {
 | 
					  mailserver = {
 | 
				
			||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
    fqdn = "lelgenio.xyz";
 | 
					    fqdn = "lelgenio.com";
 | 
				
			||||||
    domains = [
 | 
					    domains = [
 | 
				
			||||||
      "lelgenio.xyz"
 | 
					      "lelgenio.xyz"
 | 
				
			||||||
      "git.lelgenio.xyz"
 | 
					      "git.lelgenio.xyz"
 | 
				
			||||||
 | 
					      "lelgenio.com"
 | 
				
			||||||
 | 
					      "git.lelgenio.com"
 | 
				
			||||||
 | 
					      "social.lelgenio.com"
 | 
				
			||||||
    ];
 | 
					    ];
 | 
				
			||||||
    certificateScheme = "acme-nginx";
 | 
					    certificateScheme = "acme-nginx";
 | 
				
			||||||
    # Create passwords with
 | 
					    # Create passwords with
 | 
				
			||||||
    # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
 | 
					    # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
 | 
				
			||||||
    loginAccounts = {
 | 
					    loginAccounts = {
 | 
				
			||||||
 | 
					      "lelgenio@lelgenio.com" = {
 | 
				
			||||||
 | 
					        hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
 | 
				
			||||||
 | 
					        aliases = [ "postmaster@lelgenio.com" ];
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
      "lelgenio@lelgenio.xyz" = {
 | 
					      "lelgenio@lelgenio.xyz" = {
 | 
				
			||||||
        hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
 | 
					        hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
 | 
				
			||||||
        aliases = [ "postmaster@lelgenio.xyz" ];
 | 
					        aliases = [ "postmaster@lelgenio.xyz" ];
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      "noreply@git.lelgenio.xyz" = {
 | 
					      "noreply@git.lelgenio.com" = {
 | 
				
			||||||
        hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
 | 
					        hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
| 
						 | 
					@ -36,7 +43,7 @@
 | 
				
			||||||
  services.roundcube = {
 | 
					  services.roundcube = {
 | 
				
			||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
    package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
 | 
					    package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
 | 
				
			||||||
    hostName = "mail.lelgenio.xyz";
 | 
					    hostName = "mail.lelgenio.com";
 | 
				
			||||||
    extraConfig = ''
 | 
					    extraConfig = ''
 | 
				
			||||||
      $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
 | 
					      $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
 | 
				
			||||||
      $config['smtp_user'] = "%u";
 | 
					      $config['smtp_user'] = "%u";
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,15 +26,15 @@ in
 | 
				
			||||||
        DEFAULT_ACTIONS_URL = "github";
 | 
					        DEFAULT_ACTIONS_URL = "github";
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      server = {
 | 
					      server = {
 | 
				
			||||||
        DOMAIN = "git.lelgenio.xyz";
 | 
					        DOMAIN = "git.lelgenio.com";
 | 
				
			||||||
        HTTP_PORT = 3000;
 | 
					        HTTP_PORT = 3000;
 | 
				
			||||||
        ROOT_URL = "https://${srv.DOMAIN}/";
 | 
					        ROOT_URL = "https://${srv.DOMAIN}/";
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      mailer = {
 | 
					      mailer = {
 | 
				
			||||||
        ENABLED = true;
 | 
					        ENABLED = true;
 | 
				
			||||||
        SMTP_ADDR = "mail.lelgenio.xyz";
 | 
					        SMTP_ADDR = "mail.lelgenio.com";
 | 
				
			||||||
        FROM = "noreply@git.lelgenio.xyz";
 | 
					        FROM = "noreply@git.lelgenio.com";
 | 
				
			||||||
        USER = "noreply@git.lelgenio.xyz";
 | 
					        USER = "noreply@git.lelgenio.com";
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
 | 
					    mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
  services.mastodon = {
 | 
					  services.mastodon = {
 | 
				
			||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
    configureNginx = true;
 | 
					    configureNginx = true;
 | 
				
			||||||
    localDomain = "social.lelgenio.xyz";
 | 
					    localDomain = "social.lelgenio.com";
 | 
				
			||||||
    smtp.fromAddress = "lelgenio@disroot.org";
 | 
					    smtp.fromAddress = "lelgenio@disroot.org";
 | 
				
			||||||
    streamingProcesses = 2;
 | 
					    streamingProcesses = 2;
 | 
				
			||||||
    extraConfig.SINGLE_USER_MODE = "true";
 | 
					    extraConfig.SINGLE_USER_MODE = "true";
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
  services.nextcloud = {
 | 
					  services.nextcloud = {
 | 
				
			||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
    package = pkgs.nextcloud27;
 | 
					    package = pkgs.nextcloud27;
 | 
				
			||||||
    hostName = "cloud.lelgenio.xyz";
 | 
					    hostName = "cloud.lelgenio.com";
 | 
				
			||||||
    https = true;
 | 
					    https = true;
 | 
				
			||||||
    config = {
 | 
					    config = {
 | 
				
			||||||
      adminpassFile = config.age.secrets.phantom-nextcloud.path;
 | 
					      adminpassFile = config.age.secrets.phantom-nextcloud.path;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,7 @@
 | 
				
			||||||
    openDefaultPorts = true;
 | 
					    openDefaultPorts = true;
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.nginx.virtualHosts."syncthing.lelgenio.xyz" = {
 | 
					  services.nginx.virtualHosts."syncthing.lelgenio.com" = {
 | 
				
			||||||
    enableACME = true;
 | 
					    enableACME = true;
 | 
				
			||||||
    forceSSL = true;
 | 
					    forceSSL = true;
 | 
				
			||||||
    locations."/" = {
 | 
					    locations."/" = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
    acme.enable = true;
 | 
					    acme.enable = true;
 | 
				
			||||||
    nginx.enable = true;
 | 
					    nginx.enable = true;
 | 
				
			||||||
    nginx.forceSSL = true;
 | 
					    nginx.forceSSL = true;
 | 
				
			||||||
    host = "blog.lelgenio.xyz";
 | 
					    host = "blog.lelgenio.com";
 | 
				
			||||||
    admin.name = "lelgenio";
 | 
					    admin.name = "lelgenio";
 | 
				
			||||||
    admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
 | 
					    admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
 | 
				
			||||||
    settings.app = {
 | 
					    settings.app = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue