summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2019-04-11
|\
| * Merge pull request #49868 from jfrankenau/fix-triggerhappyRyan Mulligan2019-04-10
| |\
| | * nixos/triggerhappy: add option userJohannes Frankenau2018-11-12
| * | Merge pull request #59270 from basvandijk/alertmanager-DynamicUserBas van Dijk2019-04-10
| |\ \
| | * | nixos/prometheus/alertmanager: use DynamicUser instead of nobodyBas van Dijk2019-04-10
| * | | Merge pull request #59181 from Izorkin/nginx-formatJörg Thalheim2019-04-10
| |\ \ \ | | |/ / | |/| |
| | * | nixos/nginx: fix error in writeNginxConfigIzorkin2019-04-08
| * | | nixos/prometheus/alertmanager: use ExecStart instead of scriptBas van Dijk2019-04-10
| * | | Merge pull request #58858 from worldofpeace/pantheon/lightdm-gtk-greeterLinus Heckemann2019-04-10
| |\ \ \
| | * | | rl-1903: pantheon notes phrasing/organisationLinus Heckemann2019-04-08
| | * | | nixos/pantheon: add warning when not using LightDMworldofpeace2019-04-07
| | * | | nixos/lightdm-greeters/pantheon: add warningworldofpeace2019-04-07
| | * | | nixos/pantheon: enable lightdm gtk greeterworldofpeace2019-03-29
| * | | | Merge pull request #58804 from Ma27/roundcube-fixesRobin Gloster2019-04-09
| |\ \ \ \
| | * | | | nixos/roundcube: only configure postgres config if localhost is used as databaseMaximilian Bosch2019-04-02
| * | | | | nixos: Fix build of manualaszlig2019-04-09
* | | | | | Merge master into staging-nextFrederik Rietdijk2019-04-09
|\| | | | |
| * | | | | Merge pull request #58255 from jbgi/prometheus2Bas van Dijk2019-04-09
| |\ \ \ \ \
| | * | | | | nixos/doc: add Prometheus stateDir handling to rl-1909.xmlBas van Dijk2019-04-09
| | * | | | | nixos/prometheus: add back the option services.prometheus.dataDirBas van Dijk2019-04-09
| | * | | | | nixos/doc: added the Prometheus changes to the 19.09 release notesBas van Dijk2019-04-08
| | * | | | | nixos/prometheus: fix indentation and unnecessary parenthesisBas van Dijk2019-04-08
| | * | | | | nixos/tests: register the prometheus2 testBas van Dijk2019-04-08
| | * | | | | nixos/prometheus: get rid of empty argumentsBas van Dijk2019-04-08
| | * | | | | nixos/prometheus: use ExecStart instead of a shell scriptBas van Dijk2019-04-08
| | * | | | | Use same user for both prometheus 1 and 2. Use StateDirectory.Jean-Baptiste Giraudeau2019-03-25
| | * | | | | Prometheus2: --web.external-url need two dash.Jean-Baptiste Giraudeau2019-03-25
| | * | | | | Rollback versionning of services.prometheus.{exporters, alertmanager}.Jean-Baptiste Giraudeau2019-03-25
| | * | | | | Fix alertmanager service definition. Thanks to @eonpataponAlberto Berti2019-03-25
| | * | | | | Make it pass a minimal testAlberto Berti2019-03-25
| | * | | | | Add prometheus2 configuration to the prometheus modulesAlberto Berti2019-03-25
| * | | | | | elk: 6.5.1 -> 6.7.1Bas van Dijk2019-04-09
| * | | | | | Merge pull request #58398 from Ma27/package-documizeRobin Gloster2019-04-08
| |\ \ \ \ \ \
| | * | | | | | documize-community: init at 2.2.1Maximilian Bosch2019-04-08
| * | | | | | | iodine: improve password handling (#58806)Ingo Blechschmidt2019-04-08
| * | | | | | | Merge pull request #58027 from DanielFabian/gfxpayloadSamuel Dionne-Riel2019-04-08
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | grub: Add support for gfxpayload in grub. Needed for NVIDIA drivers before KM...Daniel Fabian2019-04-08
| | | |_|_|/ / | | |/| | | |
| * | | | | | nixos/sshd: Remove obsolete Protocol options (#59136)Aneesh Agrawal2019-04-08
| * | | | | | Merge pull request #58976 from gilligan/remove-nodejs6Samuel Dionne-Riel2019-04-07
| |\ \ \ \ \ \
| | * | | | | | Remove nodejs-6_x which is about to enter EOLtobias pflug2019-04-04
| * | | | | | | Merge pull request #51918 from bobvanderlinden/var-runFlorian Klink2019-04-07
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/tests: nghttpx: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/tests: osquery: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/openvswitch: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/docker: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/xpra: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/kodi: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/mighttpd2: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/tt-rss: /var/run -> /runBob van der Linden2019-03-24
| | * | | | | | | nixos/selfoss: /var/run -> /runBob van der Linden2019-03-24