Satori: clear up services
This commit is contained in:
		@@ -22,7 +22,7 @@
 | 
			
		||||
    wireguard.interfaces.wg0 = {
 | 
			
		||||
      ips = [ "10.55.0.3/32" ];
 | 
			
		||||
      listenPort = 17840;
 | 
			
		||||
      privateKeyFile = "/var/wg";
 | 
			
		||||
      privateKeyFile = "/var/secrets/wg.key";
 | 
			
		||||
      peers = [
 | 
			
		||||
        {
 | 
			
		||||
          #Oracle VM1
 | 
			
		||||
 
 | 
			
		||||
@@ -2,43 +2,6 @@
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  services = {
 | 
			
		||||
 /*   openvpn.servers = {
 | 
			
		||||
      satori = {
 | 
			
		||||
        config = ''
 | 
			
		||||
          remote weirdnatto.in
 | 
			
		||||
          dev tun
 | 
			
		||||
          ifconfig 10.55.0.3 10.55.0.1
 | 
			
		||||
          secret /var/secrets/openvpn.key
 | 
			
		||||
        '';
 | 
			
		||||
      };
 | 
			
		||||
    };*/
 | 
			
		||||
    vault-agent = {
 | 
			
		||||
      enable = false;
 | 
			
		||||
      settings = {
 | 
			
		||||
        vault = {
 | 
			
		||||
          address = "https://10.55.0.2:8800";
 | 
			
		||||
          client_cert = "/var/certs/cert.pem";
 | 
			
		||||
          client_key = "/var/certs/key.pem";
 | 
			
		||||
        };
 | 
			
		||||
        auto_auth = {
 | 
			
		||||
          method = [
 | 
			
		||||
            {
 | 
			
		||||
              "cert" = {
 | 
			
		||||
                name = "Satori";
 | 
			
		||||
              };
 | 
			
		||||
            }
 | 
			
		||||
          ];
 | 
			
		||||
        };
 | 
			
		||||
        template = [
 | 
			
		||||
          {
 | 
			
		||||
            source = pkgs.writeText "openvpn.tpl" ''
 | 
			
		||||
              {{ with secret "kv/openvpn" }}{{ .Data.data.secret }}{{ end }}
 | 
			
		||||
            '';
 | 
			
		||||
            destination = "/var/secrets/openvpn.key";
 | 
			
		||||
          }
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
    tor.enable = true;
 | 
			
		||||
    logmein-hamachi.enable = true;
 | 
			
		||||
    openssh = {
 | 
			
		||||
@@ -49,24 +12,19 @@
 | 
			
		||||
    udev.extraRules = ''
 | 
			
		||||
      ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
 | 
			
		||||
    '';
 | 
			
		||||
    mysql = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      package = pkgs.mysql;
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  systemd.services = {
 | 
			
		||||
    tor.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    mysql.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    logmein-hamachi.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    openssh.wantedBy = lib.mkForce [ ];
 | 
			
		||||
    #printing.wantedBy = lib.mkForce [];
 | 
			
		||||
    #vault.wantedBy = lib.mkForce [];
 | 
			
		||||
  };
 | 
			
		||||
  security.pki.certificateFiles = [ ../../cert.pem ];
 | 
			
		||||
  /* virtualisation.libvirtd = {
 | 
			
		||||
  virtualisation.libvirtd = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    onBoot = "ignore";
 | 
			
		||||
    onShutdown = "shutdown";
 | 
			
		||||
    qemuRunAsRoot = false;
 | 
			
		||||
    };*/
 | 
			
		||||
    qemu.runAsRoot = true;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -31,13 +31,13 @@
 | 
			
		||||
  };
 | 
			
		||||
  fonts.fonts = with pkgs; [
 | 
			
		||||
    fira-mono
 | 
			
		||||
    noto-fonts-cjk
 | 
			
		||||
    lohit-fonts.devanagari
 | 
			
		||||
    lohit-fonts.gurmukhi
 | 
			
		||||
    nerdfonts
 | 
			
		||||
    font-awesome
 | 
			
		||||
    monoid
 | 
			
		||||
    office-code-pro
 | 
			
		||||
    noto-fonts-cjk
 | 
			
		||||
  ];
 | 
			
		||||
  users.users.natto = {
 | 
			
		||||
    isNormalUser = true;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user