christian
/
nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Master

See merge request simple-nixos-mailserver/nixos-mailserver!131
This commit is contained in:
Robin Raymond 2018-06-27 14:15:15 +00:00
parent ffc67fef46 18da60451f
commit 99f64355eb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -5,9 +5,9 @@
## Stable Releases ## 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) [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 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, ... }: { config, pkgs, ... }:
{ {
imports = [ 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 = { mailserver = {
@ -94,18 +94,18 @@ For a complete list of options, see `default.nix`.
## How to Set Up a 10/10 Mail Server Guide ## 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 ## 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 ## 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 ## 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 ### Alternative Implementations
* [NixCloud Webservices](https://github.com/nixcloud/nixcloud-webservices) * [NixCloud Webservices](https://github.com/nixcloud/nixcloud-webservices)

8
default.nix
View File

@ -97,8 +97,8 @@ in
example = '' example = ''
require ["fileinto", "mailbox"]; require ["fileinto", "mailbox"];
if address :is "from" "notifications@github.com" { if address :is "from" "gitlab@mg.gitlab.com" {
fileinto :create "GitHub"; fileinto :create "GitLab";
stop; stop;
} }
@ -560,7 +560,7 @@ in
If null the decision is left up to borg. If null the decision is left up to borg.
''; '';
}; };
auto = mkOption { auto = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -585,7 +585,7 @@ in
When using encryption the password / passphrase must be provided in passphraseFile. When using encryption the password / passphrase must be provided in passphraseFile.
''; '';
}; };
passphraseFile = mkOption { passphraseFile = mkOption {
type = types.nullOr types.path; type = types.nullOr types.path;
default = null; default = null;