forked from SelfPrivacy/selfprivacy-nixos-infect
Compare commits
1 Commits
developmen
...
master
Author | SHA1 | Date |
---|---|---|
Illia Chub | aa1530c0bf |
|
@ -5,6 +5,7 @@ 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:
|
||||||
|
|
|
@ -48,6 +48,7 @@ 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
|
||||||
|
@ -487,11 +488,11 @@ EOF
|
||||||
{
|
{
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud22;
|
package = pkgs.nextcloud21;
|
||||||
hostName = "cloud.$DOMAIN";
|
hostName = "cloud.$DOMAIN";
|
||||||
|
|
||||||
# Use HTTPS for links
|
# Use HTTPS for links
|
||||||
https = true;
|
https = false;
|
||||||
|
|
||||||
# Auto-update Nextcloud Apps
|
# Auto-update Nextcloud Apps
|
||||||
autoUpdateApps.enable = true;
|
autoUpdateApps.enable = true;
|
||||||
|
@ -670,7 +671,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 = "568add06c6d622d417582ce55e3cc960686721ed";
|
rev = "0980039a67c32a128a96ac73c98fc87aad64674b";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = [ flask flask-restful pandas ];
|
propagatedBuildInputs = [ flask flask-restful pandas ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -775,9 +776,6 @@ dns = 1.1.1.1
|
||||||
dns = 1.0.0.1
|
dns = 1.0.0.1
|
||||||
|
|
||||||
route = default
|
route = default
|
||||||
|
|
||||||
cisco-client-compat = true
|
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1340,10 +1338,6 @@ 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
|
||||||
|
@ -1353,4 +1347,4 @@ removeSwap
|
||||||
|
|
||||||
if [[ -z "$NO_REBOOT" ]]; then
|
if [[ -z "$NO_REBOOT" ]]; then
|
||||||
reboot
|
reboot
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue