Merge branch 'master' into 'master'
Master See merge request simple-nixos-mailserver/nixos-mailserver!131
This commit is contained in:
commit
99f64355eb
2 changed files with 11 additions and 11 deletions
14
README.md
14
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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue