From bb26860cf2a05f443142379084bf36a59ef8577f Mon Sep 17 00:00:00 2001 From: nico202 Date: Wed, 27 Jun 2018 14:43:20 +0200 Subject: [PATCH 1/3] readme: remove references to github -> gitlab --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c550b56..fcfdca3 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ ## Stable Releases -* [SNM v2.1.4](https://github.com/r-raymond/nixos-mailserver/releases/v2.1.4) +* [SNM v2.1.4](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/tags/v2.1.4) -[Latest Release (Candidate)](https://github.com/r-raymond/nixos-mailserver/releases/latest) +[Latest Release (Candidate)](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/tags/v2.1.2) [Subscribe to SNM Announcement List](https://www.freelists.org/list/snm) This is a very low volume list where new releases of SNM are announced, so you @@ -67,7 +67,7 @@ See the [mailing list archive](https://www.freelists.org/archive/snm/) { config, pkgs, ... }: { imports = [ - (builtins.fetchTarball "https://github.com/r-raymond/nixos-mailserver/archive/v2.1.4.tar.gz") + (builtins.fetchTarball "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.1.4/nixos-mailserver-v2.1.4.tar.gz") ]; mailserver = { @@ -94,18 +94,18 @@ For a complete list of options, see `default.nix`. ## How to Set Up a 10/10 Mail Server Guide -Check out the [Complete Setup Guide](https://github.com/r-raymond/nixos-mailserver/wiki/A-Complete-Setup-Guide) in the project's wiki. +Check out the [Complete Setup Guide](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/wikis/A-Complete-Setup-Guide) in the project's wiki. ## How to Backup -Checkout the [Complete Backup Guide](https://github.com/r-raymond/nixos-mailserver/wiki/A-Complete-Backup-Guide). Backups are easy with `SNM`. +Checkout the [Complete Backup Guide](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/wikis/A-Complete-Backup-Guide). Backups are easy with `SNM`. ## Development -See the [How to Develop SNM](https://github.com/r-raymond/nixos-mailserver/wiki/How-to-Develop-SNM) wiki page. +See the [How to Develop SNM](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/wikis/How-to-Develop-SNM) wiki page. ## Contributors -See the [contributor tab](https://github.com/r-raymond/nixos-mailserver/graphs/contributors) +See the [contributor tab](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/graphs/master) ### Alternative Implementations * [NixCloud Webservices](https://github.com/nixcloud/nixcloud-webservices) From 3541f76be5310ef8673586c5cb44d7a6939f0365 Mon Sep 17 00:00:00 2001 From: nico202 Date: Wed, 27 Jun 2018 14:47:41 +0200 Subject: [PATCH 2/3] Remove reference to github in sieveScript example --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 80d7708..b418152 100644 --- a/default.nix +++ b/default.nix @@ -97,8 +97,8 @@ in example = '' require ["fileinto", "mailbox"]; - if address :is "from" "notifications@github.com" { - fileinto :create "GitHub"; + if address :is "from" "gitlab@mg.gitlab.com" { + fileinto :create "GitLab"; stop; } From 18da60451f0981ea33b08ca3949902fe90035e1e Mon Sep 17 00:00:00 2001 From: nico202 Date: Wed, 27 Jun 2018 14:48:07 +0200 Subject: [PATCH 3/3] clean extra whitespaces --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index b418152..36d0848 100644 --- a/default.nix +++ b/default.nix @@ -560,7 +560,7 @@ in If null the decision is left up to borg. ''; }; - + auto = mkOption { type = types.bool; default = false; @@ -585,7 +585,7 @@ in When using encryption the password / passphrase must be provided in passphraseFile. ''; }; - + passphraseFile = mkOption { type = types.nullOr types.path; default = null;