Bas van Dijk
08b277e0da
Merge pull request #56017 from elohmeier/prom-tls
...
prometheus: add tls_config
2019-04-12 12:57:54 +02:00
Joachim F
5dafbb2cb1
Merge pull request #56719 from bricewge/miniflux-service
...
miniflux: add service
2019-04-12 09:57:30 +00:00
Silvan Mosberger
2d1fa68c83
Merge pull request #59044 from teto/strongswan_path
...
strongswan module: use strings for secrets.
2019-04-11 22:51:24 +02:00
Enno Lohmeier
da7aeb1b7d
prometheus: add tls_config
2019-04-11 20:34:31 +02:00
Frederik Rietdijk
230c67f43b
Merge master into staging-next
2019-04-11 07:50:23 +02:00
Ryan Mulligan
0960fc72b7
Merge pull request #49868 from jfrankenau/fix-triggerhappy
...
nixos/triggerhappy: add option user
2019-04-10 20:56:19 -07:00
Matthieu Coudron
08b8c6caf2
nixos/strongswan: use strings for secrets.
...
The nixos module artifically enforces type.path whereas the ipsec secret configuration files
accept pattern or relative paths.
Enforcing absolute paths already caused problems with l2tp vpn:
https://github.com/nm-l2tp/NetworkManager-l2tp/issues/108
2019-04-11 11:44:49 +09:00
Bas van Dijk
cd4486ecc3
nixos/prometheus/alertmanager: use DynamicUser instead of nobody
...
See issue #55370
2019-04-10 20:38:40 +02:00
Bas van Dijk
739bdff4a4
nixos/prometheus/alertmanager: use ExecStart instead of script
...
This results in a simpler service unit which doesn't first have to
start a shell:
> cat /nix/store/s95nsr8zbkblklanqpkiap49mkwbaq45-unit-alertmanager.service/alertmanager.service
...
ExecStart=/nix/store/4g784lwcy7kp69hg0z2hfwkhjp2914lr-alertmanager-0.16.2-bin/bin/alertmanager \
--config.file /nix/store/p2c7fyi2jkkwq04z2flk84q4wyj2ggry-checked-config \
--web.listen-address [::1]:9093 \
--log.level warn
...
2019-04-10 15:03:09 +02:00
Linus Heckemann
4557373d68
Merge pull request #58858 from worldofpeace/pantheon/lightdm-gtk-greeter
...
nixos/pantheon: enable lightdm gtk greeter
2019-04-10 09:36:20 +02:00
Robin Gloster
f370553f8f
Merge pull request #58804 from Ma27/roundcube-fixes
...
roundcube: minor fixes
2019-04-09 18:30:00 +00:00
Frederik Rietdijk
d108b49168
Merge master into staging-next
2019-04-09 16:38:35 +02:00
Bas van Dijk
2f2e2971d6
Merge pull request #58255 from jbgi/prometheus2
...
Add Prometheus 2 service in parallel with 1.x version (continuation)
2019-04-09 14:14:18 +02:00
Bas van Dijk
c95179b52f
nixos/prometheus: add back the option services.prometheus.dataDir
...
This is to ensure more backwards compatibility. Note this is not 100%
backwards compatible because we now require dataDir to begin with /var/lib/.
2019-04-09 13:13:34 +02:00
Robin Gloster
a58ab8fc05
Merge pull request #58398 from Ma27/package-documize
...
documize-community: init at 2.2.1
2019-04-08 22:34:11 +00:00
Maximilian Bosch
acbb74ed18
documize-community: init at 2.2.1
...
Documize is an open-source alternative for wiki software like Confluence
based on Go and EmberJS. This patch adds the sources for the community
edition[1], for commercial their paid-plan[2] needs to be used.
For commercial use a derivation that bundles the commercial package and
contains a `$out/bin/documize` can be passed to
`services.documize.enable`.
The package compiles the Go sources, the build process also bundles the
pre-built frontend from `gui/public` into the binary.
The NixOS module generates a simple `systemd` unit which starts the
service as a dynamic user, database and a reverse proxy won't be
configured.
[1] https://www.documize.com/get-started/
[2] https://www.documize.com/pricing/
2019-04-08 23:54:57 +02:00
worldofpeace
acedc516fe
nixos/pantheon: use evince module
2019-04-08 16:40:54 -04:00
Ingo Blechschmidt
efff2e1aa6
iodine: improve password handling ( #58806 )
...
Before this change, only passwords not containing shell metacharacters could be
used, and because the password was passed as a command-line argument, local
users could (in a very small window of time) record the password and (in an
indefinity window of time) record the length of the password.
We also use the opportunity to add a call to `exec` in the systemd start
script, so that no shell needs to hang around waiting for iodine to stop.
2019-04-08 21:20:26 +02:00
Bas van Dijk
eed84d1f8d
nixos/prometheus: fix indentation and unnecessary parenthesis
2019-04-08 19:14:42 +02:00
Bas van Dijk
7cf27feb2f
nixos/prometheus: get rid of empty arguments
...
Previously the prometheus.service file looked like:
ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus -storage.local.path=/var/lib/prometheus/metrics \
-config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
-web.listen-address=0.0.0.0:9090 \
-alertmanager.notification-queue-capacity=10000 \
-alertmanager.timeout=10s \
\
Restart=always
Now it's:
ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus \
-storage.local.path=/var/lib/prometheus/metrics \
-config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
-web.listen-address=0.0.0.0:9090 \
-alertmanager.notification-queue-capacity=10000 \
-alertmanager.timeout=10s
Restart=always
2019-04-08 14:59:12 +02:00
Bas van Dijk
a59c92903e
nixos/prometheus: use ExecStart instead of a shell script
...
This uses fewer lines of code and one less process.
2019-04-08 14:59:12 +02:00
Aneesh Agrawal
24ae4ae604
nixos/sshd: Remove obsolete Protocol options ( #59136 )
...
OpenSSH removed server side support for the v.1 Protocol
in version 7.4: https://www.openssh.com/txt/release-7.4 ,
making this option a no-op.
2019-04-08 09:49:31 +02:00
worldofpeace
8f93650fe4
nixos/pantheon: add warning when not using LightDM
2019-04-07 17:51:41 -04:00
worldofpeace
d3d5c674ba
nixos/lightdm-greeters/pantheon: add warning
2019-04-07 17:51:19 -04:00
Florian Klink
2457510db4
Merge pull request #51918 from bobvanderlinden/var-run
...
tree-wide: nixos: /var/run -> /run
2019-04-07 20:09:46 +02:00
Frederik Rietdijk
7f7da0a16f
Merge master into staging-next
2019-04-07 15:14:52 +02:00
Robin Gloster
0498ba6e06
Merge pull request #59078 from dtzWill/fix-and-update/nextcloud
...
nextcloud: fix use of mismatched php versions, updates
2019-04-07 09:55:39 +00:00
Frederik Rietdijk
4a125f6b20
Merge master into staging-next
2019-04-07 08:33:41 +02:00
Léo Gaspard
07fdcb348f
Merge pull request #59056 from aanderse/mod_php-sendmail
...
nixos/httpd: replace ssmtp with system-sendmail
2019-04-06 20:57:58 +02:00
Will Dietz
27d78f4c6c
nextcloud: use same php package throughout!
...
`phpPackage` is 7.3 by default, but `pkgs.php` is 7.2,
so this saves the need for an extra copy of php
for the purpose of running nextcloud's cron;
more importantly this fixes problems with extensions
not loading since they are built against a different php.
2019-04-06 10:34:14 -05:00
Aaron Andersen
9c9a6f380e
nixos/httpd: replace ssmtp with system-sendmail
2019-04-06 06:34:46 -04:00
Silvan Mosberger
82b8ff405b
Merge pull request #58778 from aanderse/davmail
...
nixos/davmail: set logging default to warn, instead of debug
2019-04-06 06:23:48 +02:00
Jeremy Apthorp
e8b68dd4f4
miniflux: add service
2019-04-06 03:52:15 +02:00
Gabriel Ebner
ad5cabf575
nixos/evince: init
2019-04-05 15:03:31 +02:00
Tor Hedin Brønner
c99a666aac
nixos/gnome3: add new default fonts
...
- source-code-pro is now the default monospace font
- source-sans-pro seems to be used somewhere too:
https://wiki.gnome.org/Engagement/BrandGuidelines
2019-04-05 12:13:39 +02:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging
2019-04-05 11:37:15 +02:00
Jörg Thalheim
6dd7483ce1
Merge pull request #57979 from 4z3/writeNginxConfig
...
nixos/nginx: use nginxfmt and gixy
2019-04-04 20:23:58 +01:00
Silvan Mosberger
fab50f0e91
Merge pull request #57716 from dasJ/redo-icingaweb2
...
nixos/icingaweb2: Replace most options with toINI
2019-04-04 21:20:01 +02:00
Maximilian Bosch
6b6348eaba
nixos/roundcube: only configure postgres config if localhost is used as database
...
When using a different database, the evaluation fails as
`config.services.postgresql.package` is only set if `services.postgresql` is enabled.
Also, the systemd service shouldn't have a relation to postgres if a
remote database is used.
2019-04-02 16:02:53 +02:00
Aaron Andersen
01cec5155f
nixos/davmail: set logging default to warn, instead of debug
2019-04-02 09:52:32 -04:00
Franz Pletz
ff36d95878
nixos/quicktun: init
2019-04-02 12:16:48 +02:00
Simon Lackerbauer
88c31ae57c
nixos/openldap: add new options
2019-04-01 17:24:33 +02:00
John Ericson
4ccb74011f
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
...
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
Silvan Mosberger
81e2fb5303
Merge pull request #58458 from worldofpeace/colord/no-root
...
nixos/colord: don't run as root
2019-03-30 04:06:55 +01:00
worldofpeace
099cc0482b
nixos/pantheon: enable lightdm gtk greeter
...
Pantheon's greeter has numerous issues that cannot be
fixed in a timely manner, and users are better off if they just
didn't use it by default.
2019-03-29 21:29:59 -04:00
worldofpeace
f22fbe1175
nixos/colord: don't run as root
...
Using systemd.packages because there's
a system colord service and colord-session user service
included.
2019-03-29 20:56:06 -04:00
Florian Klink
aa2878cfcf
Merge pull request #58284 from bgamari/gitlab-rails
...
nixos/gitlab: Package gitlab-rails
2019-03-28 21:12:15 +01:00
Silvan Mosberger
9d4a6cceb7
Merge pull request #57550 from florianjacob/typed-mysql-options
...
nixos/mysql: specify option types, add tests
2019-03-28 18:55:53 +01:00
Ben Gamari
af909b3238
nixos/gitlab: Package gitlab-rails
...
This utility (particularly `gitlab-rails console`) is packaged by GitLab
Omnibus and is used for diagnostics and maintenance operations.
2019-03-28 11:45:31 -04:00
Ben Gamari
b90f5f03c2
nixos/gitaly: Run gitaly with procps in scope
...
Gitaly uses `ps` to track the RSS of `gitlab-ruby` and kills it when it
detects excessive memory leakage. See
https://gitlab.com/gitlab-org/gitaly/issues/1562 .
2019-03-28 10:48:51 -04:00