Merge branch 'master' into storageareas

2016-09-29 14:25:02 -04:00 · 2016-09-29 14:25:02 -04:00 · f9fd715657
parent 07d8d008ba 603d903297
commit f9fd715657
2 changed files with 2 additions and 0 deletions
--- a/distros/ubuntu1604/zoneminder.service
+++ b/distros/ubuntu1604/zoneminder.service
@ -15,6 +15,7 @@ ExecReload=/usr/bin/zmpkg.pl restart
 ExecStop=/usr/bin/zmpkg.pl stop
 PIDFile=/var/run/zm/zm.pid
 Restart=on-abnormal
+Environment=TZ=:/etc/localtime

 [Install]
 WantedBy=multi-user.target
--- a/misc/zoneminder.service.in
+++ b/misc/zoneminder.service.in
@ -13,6 +13,7 @@ ExecStart=@BINDIR@/zmpkg.pl start
 ExecReload=@BINDIR@/zmpkg.pl restart
 ExecStop=@BINDIR@/zmpkg.pl stop
 PIDFile="@ZM_RUNDIR@/zm.pid"
+Environment=TZ=:/etc/localtime

 [Install]
 WantedBy=multi-user.target