Peter Hoeg
d2f083160f
Merge pull request #65971 from jb55/zoneminder-fix
...
zoneminder: fix nginx config
2019-11-08 17:05:27 +08:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Peter Hoeg
574ec28ef1
nixos/zoneminder: open telnet port for remote admin
2019-08-26 14:47:00 +08:00
Aaron Andersen
400c6aac71
nixos/phpfpm: deprecate extraConfig options in favor of settings options
2019-08-23 07:56:27 -04:00
Aaron Andersen
62b774a700
nixos/phpfpm: add socket option to replace the listen option
2019-08-23 07:56:21 -04:00
William Casarin
8a24d2ba44
zoneminder: fix nginx config
...
For some reason it doesn't seem to load things in the cache directory
properly without this slash.
Looks like this regression may have been introduced in:
commit 19851ec1fc
2019-08-04 11:53:06 -07:00
worldofpeace
ab34f8b39b
Merge pull request #63824 from JohnAZoidberg/zoneminder-alias
...
nixos/zoneminder: Fix package and service build
2019-07-06 21:19:23 -04:00
Aaron Andersen
278d867a9b
Revert "Merge pull request #63156 from Izorkin/phpfpm-rootless"
...
This reverts commit b5478fd1a2dbb00bfcbf
2019-06-28 21:47:43 -04:00
Elis Hirwing
b5478fd1a2
Merge pull request #63156 from Izorkin/phpfpm-rootless
...
phpfpm: do not run anything as root
2019-06-27 19:13:53 +02:00
Daniel Schaefer
19851ec1fc
nixos/zoneminder: Fix nginx config check
...
NixOS wouldn't build because the nginx config checker fails.
Location without a trailing slash "could allow an attacker to read file
stored outside the target folder.", source:
https://github.com/yandex/gixy/blob/master/docs/en/plugins/aliastraversal.md
Shouldn't change the behaviour according to
https://serverfault.com/questions/607615/using-trailing-slashes-in-nginx-configuration/607731#607731
2019-06-26 20:45:55 +02:00
Aaron Andersen
74ff20fae7
nixos/zoneminder: fix some issues with database.createLocally option
2019-06-25 12:20:22 -04:00
Izorkin
5d3805487a
nixos/zoneminder: fix work with phpfpm-rootless mode
2019-06-16 12:33:51 +03:00
Peter Hoeg
527876038e
nixos/zoneminder: font files cannot be found
2019-06-06 14:15:01 +08:00
Daniel Schaefer
786f02f7a4
treewide: Remove usage of isNull
...
isNull "is deprecated; just write e == null instead" says the Nix manual
2019-04-29 14:05:50 +02:00
scaroo
56aa491ad7
zonminder: Fix database name and username
...
PR #56889 messed up db and use naming while fixing the scope of the initialDatabases property.
This patch fixes the issue.
2019-03-09 17:21:29 +01:00
Alexandre Mazari
d7f6cdeda4
Fix locally created database ( #56889 )
...
* zoneminder: fix initial database creation
Move initialDatabases directive from the 'ensureUsers' scope to the correct outer 'mysql' one.
* zoneminder: Fix mysql username to match unix username
When database.createLocally is used, a mysql user is created with the ensureUsers directive.
It ensures that the unix user with the name provided exists and can connect to MySQL through socket.
Thus, the MySQL username used by php/perl scripts must match the unix user owning the server PID.
This patch sets the default mysql user to 'zoneminder' instead of 'zmuser'.
2019-03-09 17:57:39 +02:00
Aaron Andersen
cddb117b96
nixos/icingaweb2, nixos/restya-board, nixos/zoneminder: set phpOptions per phpfpm pool, instead of applying to every phpfpm pool
2019-03-03 07:33:25 -05:00
Alexandre Mazari
b93ea9c26f
zoneminder: fix build issue when using createLocally database
2019-02-12 22:32:11 +01:00
Peter Hoeg
982354284d
zoneminder (nixos): add basic module
2019-01-15 21:27:45 +08:00
