SelfPrivacy/selfprivacy-nixos-infect
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect.git synced 2024-11-22 12:01:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request 'Update to 0.5.3' (#17) from development into preproduction

Browse source 
Reviewed-on: https://git.selfprivacy.org/ilchub/selfprivacy-nixos-infect/pulls/17
This commit is contained in:
Illia Chub 2021-10-12 16:44:02 +03:00
parent 1e382e7fac 1d75901d0e
commit 8216fca137
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
LICENSE Normal file → Executable file
View file

1
README.md Normal file → Executable file
View file

@ -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: This script has been tested and can install NixOS from the following source distros:
On Digital Ocean: On Digital Ocean:
- Fedora 33 x64
- Ubuntu 20.04 x64 - Ubuntu 20.04 x64
On Hetzner cloud: On Hetzner cloud:

16
nixos-infect Normal file → Executable file
View file

@ -48,7 +48,6 @@ makeConf() {
./vpn/ocserv.nix ./vpn/ocserv.nix
./api/api.nix ./api/api.nix
./api/api-module.nix ./api/api-module.nix
#./social/pleroma-module.nix
./social/pleroma.nix ./social/pleroma.nix
./letsencrypt/acme.nix ./letsencrypt/acme.nix
./letsencrypt/resolve.nix ./letsencrypt/resolve.nix
@ -488,11 +487,11 @@ EOF
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud21; package = pkgs.nextcloud22;
hostName = "cloud.$DOMAIN"; hostName = "cloud.$DOMAIN";
# Use HTTPS for links # Use HTTPS for links
https = false; https = true;
# Auto-update Nextcloud Apps # Auto-update Nextcloud Apps
autoUpdateApps.enable = true; autoUpdateApps.enable = true;
@ -671,7 +670,7 @@ let
version = "1.0"; version = "1.0";
src = builtins.fetchGit { src = builtins.fetchGit {
url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git"; url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git";
rev = "0980039a67c32a128a96ac73c98fc87aad64674b"; rev = "568add06c6d622d417582ce55e3cc960686721ed";
}; };
propagatedBuildInputs = [ flask flask-restful pandas ]; propagatedBuildInputs = [ flask flask-restful pandas ];
meta = { meta = {
@ -776,6 +775,9 @@ dns = 1.1.1.1
dns = 1.0.0.1 dns = 1.0.0.1
route = default route = default
cisco-client-compat = true
''; '';
}; };
} }
@ -1338,6 +1340,10 @@ infect() {
apt update apt update
apt install -y git whois apt install -y git whois
cat > /etc/resolv.conf << EOF
nameserver 1.1.1.1
nameserver 1.0.0.1
EOF
prepareEnv prepareEnv
makeSwap # smallest (512MB) droplet needs extra memory! makeSwap # smallest (512MB) droplet needs extra memory!
checkEnv checkEnv
@ -1347,4 +1353,4 @@ removeSwap
if [[ -z "$NO_REBOOT" ]]; then if [[ -z "$NO_REBOOT" ]]; then
reboot reboot
fi fi