Merge pull request #627 from andrey-utkin/check_dir_permission

Fix recordings dir reported not writable (#620)
bluecherrydvr · Dec 11, 2023 · ce807cc · ce807cc
2 parents d10f200 + ec77668
commit ce807cc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/actions/Dockerfile b/actions/Dockerfile
@@ -175,7 +175,8 @@ RUN /usr/sbin/groupadd -rf \
  || echo "bluecherry user already exists"
 
 RUN mkdir /recordings \
- && chown bluecherry:bluecherry /recordings
+ && chown bluecherry:bluecherry /recordings \
+ && chmod ug=rwx,o=rx /recordings
 
 EXPOSE 7001/tcp 7002/tcp 
 

diff --git a/misc/postinstall.sh b/misc/postinstall.sh
@@ -150,9 +150,7 @@ case "$1" in
 		# Allow update_subdomain_certs.sh script to run as www-data
 		chown root:www-data /usr/share/bluecherry/scripts/update_subdomain_certs.sh
 		chmod 550 /usr/share/bluecherry/scripts/update_subdomain_certs.sh
-		echo "www-data ALL=(ALL) NOPASSWD: /usr/share/bluecherry/scripts/update_subdomain_certs.sh" \
-			> /etc/sudoers.d/www-data
-		chmod 0440 /etc/sudoers.d/www-data
+		install --mode ug=r,o= /usr/share/bluecherry/sudoers.d/www-data /etc/sudoers.d/www-data
 
 		mkdir -p /usr/share/bluecherry/ssl
 		cp /etc/ssl/certs/ssl-cert-snakeoil.pem /usr/share/bluecherry/ssl/bluecherry-snakeoil.pem

diff --git a/misc/sudoers.d/www-data b/misc/sudoers.d/www-data
@@ -0,0 +1,2 @@
+www-data ALL=(ALL) NOPASSWD: /usr/share/bluecherry/scripts/update_subdomain_certs.sh
+www-data ALL=(ALL) NOPASSWD: /usr/share/bluecherry/scripts/check_dir_permission.sh
diff --git a/scripts/check_dir_permission.sh b/scripts/check_dir_permission.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		www-data ALL=(ALL) NOPASSWD: /usr/share/bluecherry/scripts/update_subdomain_certs.sh
		www-data ALL=(ALL) NOPASSWD: /usr/share/bluecherry/scripts/check_dir_permission.sh