From dbb590aab4a8810bc3f91e000a518b7d5b885ab1 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Fri, 20 Aug 2021 18:02:30 +0300 Subject: [PATCH 01/11] Updated REST API version --- LICENSE | 0 README.md | 0 nixos-infect | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 nixos-infect diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/nixos-infect b/nixos-infect old mode 100644 new mode 100755 index f7f1a3b..53e383f --- a/nixos-infect +++ b/nixos-infect @@ -671,7 +671,7 @@ let version = "1.0"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git"; - rev = "0980039a67c32a128a96ac73c98fc87aad64674b"; + rev = "b9093f041b39f8c46e50084c3708f06148a01cee"; }; propagatedBuildInputs = [ flask flask-restful pandas ]; meta = { From f0383ee4b9749dbdbe0aef2945139bc2e6eba763 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Wed, 25 Aug 2021 09:40:36 +0300 Subject: [PATCH 02/11] Updated REST API --- nixos-infect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-infect b/nixos-infect index 53e383f..4ca6f72 100755 --- a/nixos-infect +++ b/nixos-infect @@ -671,7 +671,7 @@ let version = "1.0"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git"; - rev = "b9093f041b39f8c46e50084c3708f06148a01cee"; + rev = "9ec897f519ee0da38486d69461314971c99e8686"; }; propagatedBuildInputs = [ flask flask-restful pandas ]; meta = { From 8a55f2c1ed2b566a697aa0c2829ede8b922bef60 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Thu, 26 Aug 2021 12:43:33 +0300 Subject: [PATCH 03/11] Updated REST API --- nixos-infect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-infect b/nixos-infect index 4ca6f72..f3e9fbd 100755 --- a/nixos-infect +++ b/nixos-infect @@ -671,7 +671,7 @@ let version = "1.0"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git"; - rev = "9ec897f519ee0da38486d69461314971c99e8686"; + rev = "1aa0a46267eb4191f87c48f2bebe3137e955aecd"; }; propagatedBuildInputs = [ flask flask-restful pandas ]; meta = { From 1740279675a407ecd1eba0b3c522c91a879ddfb4 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Mon, 30 Aug 2021 07:48:13 +0300 Subject: [PATCH 04/11] Updated repository description --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 2adcf0a..3c89837 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ This script - is a modded version of original [nixos-infect](https://github.com/ This script has been tested and can install NixOS from the following source distros: On Digital Ocean: -- Fedora 33 x64 - Ubuntu 20.04 x64 On Hetzner cloud: From 008baea8860c6bff83c66775b17b4c8e56b60384 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Tue, 14 Sep 2021 17:36:17 +0300 Subject: [PATCH 05/11] Updated REST API --- nixos-infect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-infect b/nixos-infect index f3e9fbd..a54fa60 100755 --- a/nixos-infect +++ b/nixos-infect @@ -671,7 +671,7 @@ let version = "1.0"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git"; - rev = "1aa0a46267eb4191f87c48f2bebe3137e955aecd"; + rev = "e4267aba180ad078868ad9e0f7f4fd7c944576d6"; }; propagatedBuildInputs = [ flask flask-restful pandas ]; meta = { From 66b8fd903da323b6b4257f78f31ab1f001285e79 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Wed, 29 Sep 2021 16:10:14 +0300 Subject: [PATCH 06/11] Fixed initial DNS resolution. Fixed Cisco AnyConnect connection issue --- nixos-infect | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos-infect b/nixos-infect index a54fa60..a810692 100755 --- a/nixos-infect +++ b/nixos-infect @@ -776,6 +776,9 @@ dns = 1.1.1.1 dns = 1.0.0.1 route = default + +cisco-client-compat = true + ''; }; } @@ -1338,6 +1341,10 @@ infect() { apt update apt install -y git whois +cat > /etc/resolv.conf << EOF +nameserver 1.1.1.1 +nameserver 1.0.0.1 +EOF prepareEnv makeSwap # smallest (512MB) droplet needs extra memory! checkEnv @@ -1347,4 +1354,4 @@ removeSwap if [[ -z "$NO_REBOOT" ]]; then reboot -fi +fi \ No newline at end of file From 14b9c92555a91df3eb3cd94315af2318bd9086b0 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Tue, 5 Oct 2021 09:53:27 +0300 Subject: [PATCH 07/11] Temporarily deprecated alps webmail --- nixos-infect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-infect b/nixos-infect index a810692..f0a0e9b 100755 --- a/nixos-infect +++ b/nixos-infect @@ -44,7 +44,7 @@ makeConf() { ./files.nix ./users.nix ./mailserver/system/mailserver.nix - ./mailserver/system/alps.nix + #./mailserver/system/alps.nix ./vpn/ocserv.nix ./api/api.nix ./api/api-module.nix From 40f5a19dbb3017920518eb10f81a75f717b54b0b Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Tue, 5 Oct 2021 09:57:58 +0300 Subject: [PATCH 08/11] Update 'nixos-infect' --- nixos-infect | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos-infect b/nixos-infect index f0a0e9b..76786ae 100755 --- a/nixos-infect +++ b/nixos-infect @@ -44,7 +44,7 @@ makeConf() { ./files.nix ./users.nix ./mailserver/system/mailserver.nix - #./mailserver/system/alps.nix + ./mailserver/system/alps.nix ./vpn/ocserv.nix ./api/api.nix ./api/api-module.nix @@ -1341,10 +1341,10 @@ infect() { apt update apt install -y git whois -cat > /etc/resolv.conf << EOF -nameserver 1.1.1.1 -nameserver 1.0.0.1 -EOF +#cat > /etc/resolv.conf << EOF +#nameserver 1.1.1.1 +#nameserver 1.0.0.1 +#EOF prepareEnv makeSwap # smallest (512MB) droplet needs extra memory! checkEnv From ff75867555fd44a658fa530dc2aac1cd4e9f8c19 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Wed, 6 Oct 2021 12:06:42 +0300 Subject: [PATCH 09/11] Fixed issue with Desktop clients being not able to connect to the Nextcloud instance --- nixos-infect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-infect b/nixos-infect index 76786ae..9984165 100755 --- a/nixos-infect +++ b/nixos-infect @@ -492,7 +492,7 @@ EOF hostName = "cloud.$DOMAIN"; # Use HTTPS for links - https = false; + https = true; # Auto-update Nextcloud Apps autoUpdateApps.enable = true; From dc20c8416b267753d40ca39cc7d8d4aaa0ce77c2 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Tue, 12 Oct 2021 16:41:36 +0300 Subject: [PATCH 10/11] Updated REST API. Updated Nextcloud --- nixos-infect | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos-infect b/nixos-infect index 9984165..8bf2134 100755 --- a/nixos-infect +++ b/nixos-infect @@ -48,7 +48,6 @@ makeConf() { ./vpn/ocserv.nix ./api/api.nix ./api/api-module.nix - #./social/pleroma-module.nix ./social/pleroma.nix ./letsencrypt/acme.nix ./letsencrypt/resolve.nix @@ -488,7 +487,7 @@ EOF { services.nextcloud = { enable = true; - package = pkgs.nextcloud21; + package = pkgs.nextcloud22; hostName = "cloud.$DOMAIN"; # Use HTTPS for links @@ -671,7 +670,7 @@ let version = "1.0"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git"; - rev = "e4267aba180ad078868ad9e0f7f4fd7c944576d6"; + rev = "568add06c6d622d417582ce55e3cc960686721ed"; }; propagatedBuildInputs = [ flask flask-restful pandas ]; meta = { From be374b5963389eb7132193f09ab5d6f17a417e67 Mon Sep 17 00:00:00 2001 From: Illia Chub Date: Tue, 12 Oct 2021 16:43:06 +0300 Subject: [PATCH 11/11] Fixed initial DNS resolution issues --- nixos-infect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos-infect b/nixos-infect index 8bf2134..c711be9 100755 --- a/nixos-infect +++ b/nixos-infect @@ -1340,10 +1340,10 @@ infect() { apt update apt install -y git whois -#cat > /etc/resolv.conf << EOF -#nameserver 1.1.1.1 -#nameserver 1.0.0.1 -#EOF +cat > /etc/resolv.conf << EOF +nameserver 1.1.1.1 +nameserver 1.0.0.1 +EOF prepareEnv makeSwap # smallest (512MB) droplet needs extra memory! checkEnv