Domen Kožar
15608f6df6
Merge pull request #1068 from offlinehacker/nixos/elasticsearch/logfix
...
nixos/elasticsearch: change loglevel from DEBUG to INFO
2013-10-12 12:22:53 -07:00
Jaka Hudoklin
fd0d2872a4
nixos/elasticsearch: change loglevel from DEBUG to INFO
2013-10-12 12:43:33 +02:00
Jaka Hudoklin
285f447c49
nixos/statsd: Add support to specify managment ip/port
2013-10-12 12:37:52 +02:00
Jaka Hudoklin
677ecf4868
nixos/graphite: listen on localhost by default
2013-10-12 12:34:26 +02:00
Marc Weber
4683774277
experimental/vsftpd
...
vsftpd improvements:
- intorduce one declarative list of options
- make docummentation strings more understandable and add missing options
such as SSL/TLS support
- Use environment.etc."vsftpd".text because I can't think about any
reason why a shell script should be used.
That code was written in 2009.
2013-10-12 01:05:13 +02:00
Eelco Dolstra
a2600b7bc3
Terrible backward compatibility hack
2013-10-11 13:36:09 +02:00
Domen Kožar
cf3e36a3b9
bash: place interactiveShellInit at the end to be able to override existing settings
2013-10-11 11:55:58 +02:00
Shea Levy
a63b4dc555
Remove old efi boot stub bootloader
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-10 10:54:35 -04:00
Eelco Dolstra
a5357e80cd
Tweak the version string
...
It's now "<yy>.<mm>pre<commit-count>.<short-hash>"
(e.g. "13.10pre5678.gfedcba") for the unstable branch, and
"<yy>.<mm>.<commit-count>.<short-hash>" (e.g. "13.10.5678.gfedcba")
for stable branches.
2013-10-10 13:28:22 +02:00
Eelco Dolstra
a7824368c2
Fix setting of .version-suffix
2013-10-10 13:28:22 +02:00
Eelco Dolstra
95c98166ec
Merge .gitignore files
2013-10-10 13:28:22 +02:00
Eelco Dolstra
c8628e0989
nixos-checkout: Only fetch the Nixpkgs repo
2013-10-10 13:28:22 +02:00
Eelco Dolstra
31203732b3
Update the release expressions and the channel generators
2013-10-10 13:28:22 +02:00
Eelco Dolstra
041da5a6f9
Unify the Nixpkgs and NixOS version numbers
2013-10-10 13:28:22 +02:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00
