From 19c83e82355eff2ae45150f043ec8b98fa8aeb5a Mon Sep 17 00:00:00 2001
From: Sven Slootweg <admin@cryto.net>
Date: Sun, 26 Apr 2020 02:04:36 +0200
Subject: [PATCH] Remove obsolete stuff from system configuration

---
 configuration/default.nix | 93 ---------------------------------------
 1 file changed, 93 deletions(-)

diff --git a/configuration/default.nix b/configuration/default.nix
index a16ffad..a718550 100644
--- a/configuration/default.nix
+++ b/configuration/default.nix
@@ -14,15 +14,12 @@ let
 		];
 	};
 	pkgs = (import (fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/nixos-20.03.tar.gz") nixpkgsOptions);
-	pkgs1803 = (import (fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/nixos-18.03.tar.gz") nixpkgsOptions);
 	presets = {
 		base = (import ./presets/base.nix);
 		kvm = (import ./presets/kvm.nix);
 	};
 	nginxPresets = {
-		# php = (import ./presets/nginx/php.nix);
 		phpDisabled = (import ./presets/nginx/php-disabled.nix);
-		# cphpApplication = (import ./presets/nginx/cphp-application.nix);
 		reverseProxy = (import ./presets/nginx/reverse-proxy.nix);
 		letsEncrypt = (import ./presets/nginx/lets-encrypt.nix);
 	};
@@ -117,11 +114,6 @@ in {
 			httpsHosts = hosts: map (makeHostChecker { protocol = "https"; port = 443; }) hosts;
 		in lib.mkMerge [
 			(httpHosts [
-				# "haless.cryto.net"
-				# "todo.cryto.net"
-				# "books.cryto.net"
-				# "learn.cryto.net"
-				# "vps-list.cryto.net"
 				"iomfats.cryto.net"
 				"castleroland.cryto.net"
 				"awesomedude.cryto.net"
@@ -129,9 +121,6 @@ in {
 				"validatem.cryto.net"
 			])
 			(httpsHosts [
-				# "haless.cryto.net"
-				# "books.cryto.net"
-				# "vps-list.cryto.net"
 				"iomfats.cryto.net"
 				"castleroland.cryto.net"
 				"awesomedude.cryto.net"
@@ -193,64 +182,16 @@ in {
 				"books.cryto.net" = lib.mkMerge [
 					(nginxPresets.letsEncrypt)
 					(nginxPresets.phpDisabled)
-					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
-					# {
-					# 	root = pkgs.stdenv.mkDerivation {
-					# 		name = "cryto-books";
-					# 		src = ./sources/cryto-books;
-
-					# 		installPhase = ''
-					# 			mkdir -p $out/
-					# 			cp -r $src/* $out/
-					# 			cp ${../private/cryto-books/credentials.php} $out/credentials.php
-					# 		'';
-					# 	};
-					# }
 				];
 				"todo.cryto.net" = lib.mkMerge [
 					(nginxPresets.phpDisabled)
-					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
-					# (nginxPresets.cphpApplication (pkgs.stdenv.mkDerivation {
-					# 	name = "cryto-todo";
-					# 	src = ./sources/cryto-todo;
-
-					# 	installPhase = ''
-					# 		mkdir -p $out/public_html
-					# 		cp -r $src/* $out/public_html
-					# 		cp ${../private/cryto-todo/config.json} $out/config.json
-					# 	'';
-					# }))
 				];
 				"learn.cryto.net" = lib.mkMerge [
 					(nginxPresets.phpDisabled)
-					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
-					# (nginxPresets.cphpApplication (pkgs.stdenv.mkDerivation {
-					# 	name = "cryto-learn";
-					# 	src = ./sources/cryto-learn;
-
-					# 	installPhase = ''
-					# 		mkdir -p $out/public_html
-					# 		cp -r $src/* $out/public_html
-					# 		cp ${../private/cryto-learn/config.json} $out/config.json
-					# 	'';
-					# }))
 				];
 				"vps-list.cryto.net" = lib.mkMerge [
 					(nginxPresets.letsEncrypt)
 					(nginxPresets.phpDisabled)
-					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
-					# (nginxPresets.cphpApplication (pkgs.stdenv.mkDerivation {
-					# 	name = "vps-list";
-					# 	src = ./sources/vps-list;
-
-					# 	installPhase = ''
-					# 		mkdir -p $out/public_html
-					# 		mkdir -p $out/public_html/cphp
-
-					# 		cp -r $src/* $out/public_html
-					# 		cp ${../private/vps-list/config.php} $out/public_html/cphp/config.php
-					# 	'';
-					# }))
 				];
 				"iomfats.cryto.net" = lib.mkMerge [
 					(nginxPresets.letsEncrypt)
@@ -271,40 +212,6 @@ in {
 			};
 		};
 
-		# services.mysql = {
-		# 	enable = true;
-		# 	package = pkgs.mysql55;
-		# };
-
-		# services.phpfpm = {
-		# 	settings = {
-		# 		"log_level" = "notice";
-		# 	};
-
-		# 	phpPackage = pkgs1803.php56;
-
-		# 	pools = {
-		# 		main = {
-		# 			# listen = "/var/run/phpfpm-main.sock";
-		# 			user = "nobody";
-		# 			settings = {
-		# 				"listen.owner" = "nginx";
-		# 				"listen.group" = "nginx";
-		# 				"listen.mode" = 0660;
-
-		# 				"pm" = "dynamic";
-		# 				"pm.max_children" = 75;
-		# 				"pm.start_servers" = 10;
-		# 				"pm.min_spare_servers" = 5;
-		# 				"pm.max_spare_servers" = 20;
-		# 				"pm.max_requests" = 500;
-
-		# 				"catch_workers_output" = true;
-		# 			};
-		# 		};
-		# 	};
-		# };
-
 		users.extraUsers.mobile-proxy = {
 			description = "mobile-proxy Service User";
 		};