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

docs: no longer use tagged release but branch instead in docs

This commit is contained in:
Antoine Eiche 2020-10-30 22:19:46 +01:00
parent eba19686fb
commit 843e66864f
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README.md
View File

@ -74,13 +74,13 @@ See the [mailing list archive](https://www.freelists.org/archive/snm/)
### Quick Start ### Quick Start
```nix ```nix
{ config, pkgs, ... }: { config, pkgs, ... }:
{ let release = "nixos-20.09";
in {
imports = [ imports = [
(builtins.fetchTarball { (builtins.fetchTarball {
# Pick a commit from the branch you are interested in url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz";
url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/A-COMMIT-ID/nixos-mailserver-A-COMMIT-ID.tar.gz"; # This hash needs to be updated
# And set its hash
sha256 = "0000000000000000000000000000000000000000000000000000"; sha256 = "0000000000000000000000000000000000000000000000000000";
}) })
]; ];
@ -91,7 +91,8 @@ See the [mailing list archive](https://www.freelists.org/archive/snm/)
domains = [ "example.com" "example2.com" ]; domains = [ "example.com" "example2.com" ];
loginAccounts = { loginAccounts = {
"user1@example.com" = { "user1@example.com" = {
hashedPassword = "$6$/z4n8AQl6K$kiOkBTWlZfBd7PvF5GsJ8PmPgdZsFGN1jPGZufxxr60PoR0oUsrvzm2oQiflyz5ir9fFJ.d/zKm/NgLXNUsNX/"; # mkpasswd -m sha-512 "super secret password" > /hashed/password/file/location
hashedPasswordFile = "/hashed/password/file/location";
aliases = [ aliases = [
"info@example.com" "info@example.com"
@ -101,7 +102,7 @@ See the [mailing list archive](https://www.freelists.org/archive/snm/)
}; };
}; };
}; };
} }
``` ```
For a complete list of options, see `default.nix`. For a complete list of options, see `default.nix`.

12
docs/quick-start.rst
View File

@ -4,22 +4,24 @@ Quick Start
.. code:: nix .. code:: nix
{ config, pkgs, ... }: { config, pkgs, ... }:
{ let release = "nixos-20.09";
in {
imports = [ imports = [
(builtins.fetchTarball { (builtins.fetchTarball {
url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz"; url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz";
sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx"; # This hash needs to be updated
sha256 = "0000000000000000000000000000000000000000000000000000";
}) })
]; ];
mailserver = { mailserver = {
enable = true; enable = true;
fqdn = "mail.example.com"; fqdn = "mail.example.com";
domains = [ "example.com" "example2.com" ]; domains = [ "example.com" "example2.com" ];
loginAccounts = { loginAccounts = {
"user1@example.com" = { "user1@example.com" = {
hashedPassword = "$6$/z4n8AQl6K$kiOkBTWlZfBd7PvF5GsJ8PmPgdZsFGN1jPGZufxxr60PoR0oUsrvzm2oQiflyz5ir9fFJ.d/zKm/NgLXNUsNX/"; # mkpasswd -m sha-512 "super secret password" > /hashed/password/file/location
hashedPasswordFile = "/hashed/password/file/location";
aliases = [ aliases = [
"info@example.com" "info@example.com"