Commit Graph

690 Commits

Author SHA1 Message Date
Robert Schütz
e4a6e320bb home-assistant: simplify definition of configFile 2018-04-24 20:49:16 +02:00
Will Dietz
fa1d1eec6e nixos/nix-daemon: optionally (on by default) check nix.conf can be read
* checks using package providing the nix-daemon that we'll be using
* made optional (unlike some other config checks) "just in case":
  since this requires running the new Nix on the builder, this
  won't work in a few (AFAIK very uncommon) situations such as
  cross-compiling NixOS or using `include` directives in nix.conf

This does rely on Nix2 but not by the builder.
Since we only offer Nix2+ in-tree this should be fine,
and may otherwise be required anyway.
2018-04-24 10:16:57 -05:00
Peter Hoeg
b886faa6b6 home-assistant: use remarshal to convert configuration to YAML
HA doesn't mind the configuration being JSON instead of YAML but since YAML is
the official language, use that as it allows users to easily exchange config
data with other parties in the community.
2018-04-23 16:53:13 +08:00
Peter Hoeg
4cd88807d8 home-assistant: make port configurable so we can use it elsewhere
Additionally, some settings based on NixOS configuation is set via defaultConfig
which is then merged with the user provided configration.

For now that just means http port and time zone but others can easily be added.
2018-04-23 16:53:12 +08:00
Wout Mertens
77a1993b46
Merge pull request #38918 from gnidorah/gitweb
nixos/gitweb: add gitwebTheme option
2018-04-20 21:32:34 +02:00
John Ericson
53686e8995
Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options
nixpkgs module: Clean up platform options
2018-04-19 14:59:58 -04:00
gnidorah
9029ed933c nixos/gitweb: add gitwebTheme option 2018-04-17 20:07:01 +03:00
Matthew Justin Bauer
9e01411a7c
Merge pull request #37515 from MHOOO/patch-2
Fix permission on working directory
2018-04-17 10:40:49 -05:00
Reuben D'Netto
42a84598fb Added cross-references to NixOS manual 2018-04-12 09:39:14 +10:00
BjornMelgaard
46c270c5a6 safeeyes: restart only on failure 2018-04-10 21:19:13 +03:00
BjornMelgaard
2f4a220130 safeeyes: add module 2018-04-10 21:19:13 +03:00
Wout Mertens
d55e830982
Merge pull request #38527 from gnidorah/gitweb
nixos/nginx: fix gitweb submodule
2018-04-07 14:39:51 +02:00
gnidorah
073089914e nixos/nginx: fix gitweb submodule 2018-04-06 22:36:03 +03:00
John Ericson
c6f7d43678 nixpkgs module: Clean up platform options
- `localSystem` is added, it strictly supercedes system

 - `crossSystem`'s description mentions `localSystem` (and vice versa).

 - No more weird special casing I don't even understand

TEMP
2018-04-06 12:41:44 -04:00
Michael Raskin
b07ce1fb74
Merge pull request #38114 from oxij/nixos/doc-module
nixos: doc module
2018-04-05 07:09:32 +00:00
Michael Raskin
195521350a
Merge pull request #38111 from oxij/tree/cleanups
assorted cleanups
2018-04-05 07:08:05 +00:00
Eelco Dolstra
0236a947d0
mkdir -> install -d
Fixes #38421.
2018-04-04 13:04:35 +02:00
Nikolay Amiantov
37546be900 nodePackages.parsoid: pin service-runner to 2.3.0
service-runner had a backwards incompatible update, and parsoid 0.9.0
doesn't work with current stable MediaWiki. Instead use as a source
a repository with 0.8.0 and pinned service-runner version.
2018-04-02 22:38:40 +03:00
Léo Gaspard
b59570eac0 nixos/gogs: allow git operations over ssh
Without `ROOT_PATH` set, `gogs serv` tries to open logs in writing in
its store directory. This blocks cloning or pushing over ssh, and
results in a gogs internal error.
2018-03-30 16:37:36 +02:00
Jan Malakhovski
02da27de52 nixos: dysnomia: move into services subtree 2018-03-30 06:56:12 +00:00
Jan Malakhovski
98fd9b7f86 nixos: doc: introduce documentation config subtree 2018-03-30 06:52:26 +00:00
gnidorah
2821d3fed7 gitweb: use common options 2018-03-29 16:45:32 +03:00
Matthew Justin Bauer
779c25b2fe
Merge pull request #34053 from thpham/serviio
serviio: init at 1.9
2018-03-22 11:11:17 -05:00
Franz Pletz
e5a854e740
gitlab service: use recommended unicorn config 2018-03-22 02:29:28 +01:00
Simon Lackerbauer
1b55905806
gitlab: 10.3.4 -> 10.5.4 2018-03-22 02:29:28 +01:00
Robin Gloster
31d77fd4f3
gitlab-shell: fix config path finding
and remove TimeoutSec for gitlab
2018-03-22 02:29:27 +01:00
Thomas Karolski
e5073bcb80
Fix permission on working directory
The working directory needs the x flag, otherwise executors (e.g. sparks executor) are unable to cd into their sandbox and create e.g. temporary files.
2018-03-21 02:26:04 +01:00
Eelco Dolstra
7db841512a
Remove obsolete /nix/var/nix/{manifests,channel-cache} 2018-03-20 18:26:13 +01:00
Peter Hoeg
2859483fe9 nixos home-assistant: a couple of fixes (#36338)
a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)
2018-03-18 12:46:36 +01:00
Elis Hirwing
fa76c9a385
gitea: fix usage over ssh
Using gitea over ssh had two isses:
 1. No shell was set for the user
 2. Gitea tried to write logs to
 /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
 serving the ssh usage.
2018-03-18 10:11:02 +01:00
Tuomas Tynkkynen
ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Elis Hirwing
1ad75d0c50
gitea: enable and configure postgres service if selected as database 2018-03-15 18:34:54 +01:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Vladimír Čunát
b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
Shea Levy
5ff15fbf7d
Merge branch 'nix-ssh-ng' 2018-02-28 17:04:19 -05:00
Shea Levy
4de72b90f3
nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
Sander van der Burg
8fbfd67f1f disnix module: make dbus service configurable 2018-02-28 21:29:24 +01:00
Eelco Dolstra
212dd84dd2
Cleanup 2018-02-27 20:03:12 +01:00
Markus Hauck
1c3c80360b logkeys.service: Add 'device' option 2018-02-21 18:16:14 +01:00
Will Dietz
e5e29284a9 webos: init novacom, novacomd, cmake-modules; add nixos service 2018-02-20 10:34:19 -06:00
Jan Malakhovski
2e6b796761 nixos: rename config.system.nixos* -> config.system.nixos.* 2018-02-18 12:56:30 +00:00
Jörg Thalheim
7914e6be3e
Merge pull request #34655 from markus1189/zookeeper-package-option
zookeeper.service: option for package and add to environment
2018-02-10 09:54:12 +00:00
Frederik Rietdijk
c0f6aac818
Merge pull request #34574 from dotlambda/home-assistant
nixos/home-assistant: support platform=... scheme for autoExtraComponents
2018-02-08 10:53:35 +00:00
Thomas Pham
f0bafef6a1 add Serviio Media server package and service 2018-02-07 20:45:30 +01:00
Markus Hauck
77218de812 zookeeper.service: option for package and add to environment 2018-02-06 09:59:01 +01:00
David McFarland
fbba0d0ee5 matrix-synapse: default server_name to hostname 2018-02-04 21:22:55 -04:00
David McFarland
a4b7de74a5 matrix-synapse: default to postgresql on 18.03 2018-02-04 21:22:55 -04:00
David McFarland
1472fa8685 matrix-synapse: create and connect to local postgresql db 2018-02-04 21:22:54 -04:00
Robert Schütz
59eb19224b nixos/home-assistant: support platform=... scheme for autoExtraComponents
See https://home-assistant.io/components/sensor.luftdaten/ for an example component using that scheme.
2018-02-04 11:09:55 +01:00
adisbladis
7ebb82e04f
home-assistant: Fix incorrect xml closing tag 2018-02-03 16:54:02 +08:00
Robert Schütz
78c2ca326e home-assistant: compute extraComponents from config 2018-02-02 09:48:50 +01:00
Frederik Rietdijk
d30735f889
Merge pull request #34188 from dotlambda/home-assistant
home-assistant: init at 0.62.1
2018-02-01 08:44:48 +00:00
Eelco Dolstra
700e21d6da nix-daemon.nix: Updates for Nix 2.0
* The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and
  NIX_REMOTE are no longer needed.

* A /bin/sh (from busybox) is provided by default in sandboxes.

* Various options were renamed.
2018-01-31 22:26:05 +01:00
Robert Schütz
bacbc48cfe home-assistant: add NixOS module 2018-01-31 12:30:31 +01:00
Johannes Bornhold
a88b4d4db1 nixos/matrix-synapse: Add module parameter extraConfigFiles (#33276)
This allows to configure additional configuration files for Synapse. This way
secrets can be kept in a secure place on the file system without a need to go
through the Nix store.
2018-01-07 20:13:48 +00:00
Robin Gloster
e606bb252b
gitlab module: config changes for gitlab 10.3 2018-01-07 05:02:56 +01:00
Robin Gloster
69c396f273
gitlab module: gitaly fixes 2018-01-07 05:02:35 +01:00
Orivej Desh
b249907d04
Merge pull request #33197 from bgamari/gitlab-jws-fix
gitlab: Rename jws_private_key to openid_connect_signing_key
2018-01-06 03:08:57 +00:00
Ben Gamari
b95cdd4f6c gitlab: Rename jws_private_key to openid_connect_signing_key
See
24d56df29b
2017-12-29 22:11:04 -05:00
Robin Gloster
c4036762b2
gitlab: remove unnecessary assertion
It also gives less information than the error from the module system.
2017-12-26 01:11:16 +01:00
Yegor Timoshenko
f89bc2718b
Merge pull request #32995 from NixOS/yegortimoshenko-patch-1
mbpfan: improve description, resolves #32266
2017-12-23 17:31:13 +03:00
Yegor Timoshenko
ca7472b1a7
mbpfan: improve description, resolves #32266 2017-12-23 14:28:37 +00:00
Silvan Mosberger
0b0df8f9cf nixos/logkeys: fix evaluation 2017-12-23 01:44:14 +00:00
Bjørn Forsman
7c481aa7c1 nixos/gitolite: copy hooks with force
This makes the commonHook option work also for (read-only) Nix store
paths. Currently it fails on the second activation, because the
destination is read-only.
2017-12-21 08:41:59 +01:00
Sander van der Burg
9cee2e5c95 dysnomia module: use postgres as default user and always publish container properties 2017-12-20 21:45:07 +01:00
Franz Pletz
2754d1a8c3
xmr-stak module: init 2017-12-14 16:03:09 +01:00
Joachim F
1541211c31
Merge pull request #32261 from erictapen/osrm-module
osrm service: init
2017-12-07 21:32:42 +00:00
Justin Humm
bfc3844a15 osrm service: init 2017-12-07 18:51:39 +01:00
Pierre-Etienne Meunier
3b79220a41 nixos/gollum: enable emoji and file uploads (#32373) 2017-12-06 09:10:54 +00:00
Pierre-Etienne Meunier
8e97f8fac4 nixos/gollum: Add optional MathJax support (#32338) 2017-12-05 12:20:31 +00:00
Ruben Maher
50777e5702 nixos/matrix-synapse: remove unused log_file config 2017-11-20 09:29:45 +10:30
Ruben Maher
86e161ff47 nixos/matrix-synapse: make home directory configurable 2017-11-19 13:48:29 +10:30
Renaud
1503409aac
Merge pull request #30943 from csingley/nzbget
nzbget.service override nzbget.conf broken paths with current derivation
2017-11-11 22:04:29 +01:00
Márton Boros
c556c72a2e nixos/gitlab: fix secret generation
This line previously produced an error and an empty secret file.
2017-10-30 12:49:27 +01:00
Márton Boros
00c03e9003 nixos/gitlab: fix preStart script 2017-10-30 12:49:27 +01:00
Márton Boros
29e80bde40 nixos/gitlab: fix hard-coded database name 2017-10-30 12:49:27 +01:00
Christopher Singley
b2c2944998 nzbget.service override nzbget.conf broken paths with current derivation 2017-10-29 19:37:56 -05:00
Christopher Singley
95dc36235c PlexPy service 2017-10-29 19:29:25 -05:00
Linus Heckemann
b2c5075e8a nixos-manual service: show nixos-help option
Part of improving accessibility (#30760). Makes the manual easier to
access e.g. on serial consoles.
2017-10-25 10:16:15 +01:00
Márton Boros
a89b28f8b7 nixos/gitlab: fix startup script
The preStart script used a hardcoded "git" user instead of the cfg value.
2017-10-22 15:23:25 +02:00
Simon Lackerbauer
414720709b
gitlab-module: fix hooks links for older repositories 2017-10-22 14:28:56 +02:00
Joachim F
3c62474d08 Merge pull request #30528 from disassembler/gitea
gitea: init at 1.2.1
2017-10-20 14:01:54 +00:00
Michael Peyton Jones
281bf1dded tzupdate service: init 2017-10-19 05:15:32 +01:00
Samuel Leathers
66201d49bb gitea: add nixos service module 2017-10-18 12:50:36 -04:00
Markus Mueller
60b0db0e08
gitlab: link tmp/ directory to writable path 2017-10-16 14:58:02 +02:00
Markus Mueller
f250015ea3
nixos/gitlab: fix uploades directory permissions 2017-10-16 14:58:02 +02:00
Shaun Sharples
caee93f3d4 Fix warning about unknown escape sequences
systemd warns about:

Ignoring unknown escape sequences: "/nix/store/8f0l1w9g7iv2gz63xzsxfl66ri1cfbkl-plex-1.9.5.4339/usr/lib/plexmediaserver/Plex\ Media\ Server

From a discussion on the forums it seems the 'sh -c' is not needed:

https://forums.plex.tv/discussion/216757/ubuntu-16-04-executable-path-contains-special-characters-error-with-systemd
2017-10-12 19:44:58 +02:00
Peter Hoeg
c640e790d5 pykms: nixos module 2017-10-12 08:51:34 +08:00
Frank Doepper
08bf000fe2 nix-daemon: mention speedFactor in example 2017-10-10 15:07:35 +02:00
Alexander Foremny
03a5d729ef
nixos/gitlab: fix gitlab service
Fix GitLab service and update documentation. Fixes #30059.
2017-10-04 02:40:07 +02:00
Bob van der Linden
9d841295f3 gogs: avoid creating symlinks each run 2017-10-02 22:11:46 +02:00
The-M1k3y
0f2b46cdba nixos/gogs: fixed user creation if non-default user 2017-10-02 15:53:30 +02:00
Robin Gloster
57ed9e7e1d
gitlab: 9.5.5 -> 10.0.2 2017-09-28 23:14:31 +02:00
Eelco Dolstra
79d547b4bb
nix-daemon: Bump the default number of build users
While it's annoying to pollute the user database with a lot of nixbld*
users, 10 users is really too low for many modern systems.
2017-09-27 17:13:16 +02:00
Pavel Goran
cee657f9a3 nixos/gitolite: add enableGitAnnex option 2017-09-25 22:03:00 +02:00
Bjørn Forsman
3a58e41e43 nixos/gitolite: use group 'gitolite' instead of 'nogroup'
Having files (git repositories) owned by 'nogroup' is a bad idea.
2017-09-23 16:33:52 +02:00
Pavel Goran
c73a3813fa nixos/gitolite: customize .gitolite.rc declaratively
Add the `extraGitoliteRc` option to customize the `.gitolite.rc`
configuration file declaratively.

Resolves #29249.
2017-09-22 18:29:35 +02:00
Robin Gloster
e2822f6384
gitlab: 9.5.2 -> 9.5.5 2017-09-21 20:26:12 +02:00
Robin Gloster
370ac6275e
gitlab module: fix shell hook path 2017-09-20 23:51:26 +02:00