Merge pull request #540 from Xazziri/master

Improve startup speeds in some situations by using find before chown

rootfs/etc/cont-init.d/03-config.sh

@@ -105,7 +105,7 @@ if [ -d "${LIBRENMS_PATH}/html/plugins/Weathermap" ]; then
     ln -sf /data/weathermap ${LIBRENMS_PATH}/html/plugins/Weathermap/configs
   fi
   chown -h librenms:librenms ${LIBRENMS_PATH}/html/plugins/Weathermap/configs
-  chown -R librenms:librenms /data/weathermap ${LIBRENMS_PATH}/html/plugins/Weathermap/output
+  find /data/weathermap ${LIBRENMS_PATH}/html/plugins/Weathermap/output \( ! -user librenms -o ! -group librenms \) -exec chown librenms:librenms {} +
 fi
 
 # cleanup bad symlink: https://github.com/librenms/docker/issues/294#issuecomment-1190389960
@@ -219,7 +219,7 @@ done
 # Fix perms
 echo "Fixing perms..."
 chown librenms:librenms /data/config /data/monitoring-plugins /data/plugins /data/rrd /data/weathermap /data/alert-templates
-chown -R librenms:librenms /data/logs ${LIBRENMS_PATH}/composer* ${LIBRENMS_PATH}/config.d ${LIBRENMS_PATH}/bootstrap ${LIBRENMS_PATH}/logs ${LIBRENMS_PATH}/storage ${LIBRENMS_PATH}/vendor
+find /data/logs ${LIBRENMS_PATH}/composer* ${LIBRENMS_PATH}/config.d ${LIBRENMS_PATH}/bootstrap ${LIBRENMS_PATH}/logs ${LIBRENMS_PATH}/storage ${LIBRENMS_PATH}/vendor \( ! -user librenms -o ! -group librenms \) -exec chown librenms:librenms {} +
 chmod ug+rw /data/logs /data/rrd ${LIBRENMS_PATH}/bootstrap/cache ${LIBRENMS_PATH}/storage ${LIBRENMS_PATH}/storage/framework/*
 
 # Check additional Monitoring plugins

rootfs/etc/cont-init.d/05-svc-dispatcher.sh

@@ -121,6 +121,7 @@ cat >/etc/services.d/dispatcher/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
 s6-setuidgid ${PUID}:${PGID}
-/opt/librenms/librenms-service.py ${DISPATCHER_ARGS}
+cd /opt/librenms
+./librenms-service.py ${DISPATCHER_ARGS}
 EOL
 chmod +x /etc/services.d/dispatcher/run