Browse Source

Remove obsolete stuff from system configuration

Sven Slootweg 5 months ago
parent
commit
19c83e8235
1 changed files with 0 additions and 93 deletions
  1. 0 93
      configuration/default.nix

+ 0 - 93
configuration/default.nix

@ -14,15 +14,12 @@ let
14 14
		];
15 15
	};
16 16
	pkgs = (import (fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/nixos-20.03.tar.gz") nixpkgsOptions);
17
	pkgs1803 = (import (fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/nixos-18.03.tar.gz") nixpkgsOptions);
18 17
	presets = {
19 18
		base = (import ./presets/base.nix);
20 19
		kvm = (import ./presets/kvm.nix);
21 20
	};
22 21
	nginxPresets = {
23
		# php = (import ./presets/nginx/php.nix);
24 22
		phpDisabled = (import ./presets/nginx/php-disabled.nix);
25
		# cphpApplication = (import ./presets/nginx/cphp-application.nix);
26 23
		reverseProxy = (import ./presets/nginx/reverse-proxy.nix);
27 24
		letsEncrypt = (import ./presets/nginx/lets-encrypt.nix);
28 25
	};
@ -117,11 +114,6 @@ in {
117 114
			httpsHosts = hosts: map (makeHostChecker { protocol = "https"; port = 443; }) hosts;
118 115
		in lib.mkMerge [
119 116
			(httpHosts [
120
				# "haless.cryto.net"
121
				# "todo.cryto.net"
122
				# "books.cryto.net"
123
				# "learn.cryto.net"
124
				# "vps-list.cryto.net"
125 117
				"iomfats.cryto.net"
126 118
				"castleroland.cryto.net"
127 119
				"awesomedude.cryto.net"
@ -129,9 +121,6 @@ in {
129 121
				"validatem.cryto.net"
130 122
			])
131 123
			(httpsHosts [
132
				# "haless.cryto.net"
133
				# "books.cryto.net"
134
				# "vps-list.cryto.net"
135 124
				"iomfats.cryto.net"
136 125
				"castleroland.cryto.net"
137 126
				"awesomedude.cryto.net"
@ -193,64 +182,16 @@ in {
193 182
				"books.cryto.net" = lib.mkMerge [
194 183
					(nginxPresets.letsEncrypt)
195 184
					(nginxPresets.phpDisabled)
196
					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
197
					# {
198
					# 	root = pkgs.stdenv.mkDerivation {
199
					# 		name = "cryto-books";
200
					# 		src = ./sources/cryto-books;
201
202
					# 		installPhase = ''
203
					# 			mkdir -p $out/
204
					# 			cp -r $src/* $out/
205
					# 			cp ${../private/cryto-books/credentials.php} $out/credentials.php
206
					# 		'';
207
					# 	};
208
					# }
209 185
				];
210 186
				"todo.cryto.net" = lib.mkMerge [
211 187
					(nginxPresets.phpDisabled)
212
					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
213
					# (nginxPresets.cphpApplication (pkgs.stdenv.mkDerivation {
214
					# 	name = "cryto-todo";
215
					# 	src = ./sources/cryto-todo;
216
217
					# 	installPhase = ''
218
					# 		mkdir -p $out/public_html
219
					# 		cp -r $src/* $out/public_html
220
					# 		cp ${../private/cryto-todo/config.json} $out/config.json
221
					# 	'';
222
					# }))
223 188
				];
224 189
				"learn.cryto.net" = lib.mkMerge [
225 190
					(nginxPresets.phpDisabled)
226
					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
227
					# (nginxPresets.cphpApplication (pkgs.stdenv.mkDerivation {
228
					# 	name = "cryto-learn";
229
					# 	src = ./sources/cryto-learn;
230
231
					# 	installPhase = ''
232
					# 		mkdir -p $out/public_html
233
					# 		cp -r $src/* $out/public_html
234
					# 		cp ${../private/cryto-learn/config.json} $out/config.json
235
					# 	'';
236
					# }))
237 191
				];
238 192
				"vps-list.cryto.net" = lib.mkMerge [
239 193
					(nginxPresets.letsEncrypt)
240 194
					(nginxPresets.phpDisabled)
241
					# (nginxPresets.php args) /* Temporary hack until I can figure out the mkMerge evaluation order issue */
242
					# (nginxPresets.cphpApplication (pkgs.stdenv.mkDerivation {
243
					# 	name = "vps-list";
244
					# 	src = ./sources/vps-list;
245
246
					# 	installPhase = ''
247
					# 		mkdir -p $out/public_html
248
					# 		mkdir -p $out/public_html/cphp
249
250
					# 		cp -r $src/* $out/public_html
251
					# 		cp ${../private/vps-list/config.php} $out/public_html/cphp/config.php
252
					# 	'';
253
					# }))
254 195
				];
255 196
				"iomfats.cryto.net" = lib.mkMerge [
256 197
					(nginxPresets.letsEncrypt)
@ -271,40 +212,6 @@ in {
271 212
			};
272 213
		};
273 214
274
		# services.mysql = {
275
		# 	enable = true;
276
		# 	package = pkgs.mysql55;
277
		# };
278
279
		# services.phpfpm = {
280
		# 	settings = {
281
		# 		"log_level" = "notice";
282
		# 	};
283
284
		# 	phpPackage = pkgs1803.php56;
285
286
		# 	pools = {
287
		# 		main = {
288
		# 			# listen = "/var/run/phpfpm-main.sock";
289
		# 			user = "nobody";
290
		# 			settings = {
291
		# 				"listen.owner" = "nginx";
292
		# 				"listen.group" = "nginx";
293
		# 				"listen.mode" = 0660;
294
295
		# 				"pm" = "dynamic";
296
		# 				"pm.max_children" = 75;
297
		# 				"pm.start_servers" = 10;
298
		# 				"pm.min_spare_servers" = 5;
299
		# 				"pm.max_spare_servers" = 20;
300
		# 				"pm.max_requests" = 500;
301
302
		# 				"catch_workers_output" = true;
303
		# 			};
304
		# 		};
305
		# 	};
306
		# };
307
308 215
		users.extraUsers.mobile-proxy = {
309 216
			description = "mobile-proxy Service User";
310 217
		};