Merge branch 'master' of https://git.pomf.se/Pomf/uguu

diff --cc docker/Dockerfile
index 028d138cee3ab06707e90a2289718b73c49a820e,26349284f344db68f37403f98244bc13ceb00f3c..bf9cfb9439965ebb50aeff9ed20cfa3736392bf5
--- 1/docker/Dockerfile
--- 2/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -29,39 -20,23 +29,39 @@@ RUN tar xvf v${VERSION}.tar.g
  RUN mkdir /var/www/uguu/dist && \
      mkdir /var/www/db && \
      mkdir /var/www/files
--    
++
 +# Create the Sqlite DB
  RUN sqlite3 /var/www/db/uguu.sq3 -init /var/www/uguu/sqlite_schema.sql && \
 -    chown -R www-data:www-data /var/www/db /var/www/files && \
 +    chown -R www-data:www-data /var/www && \
      chmod -R 775 /var/www/
  
 +# Fix script paths
  RUN chmod a+x /var/www/uguu/checkdb.sh && \
      chmod a+x /var/www/uguu/checkfiles.sh && \
      sed -i 's#/path/to/files/#/var/www/uguu/files/#g' /var/www/uguu/checkfiles.sh && \
--    sed -i 's#/path/to/db/uguu.sq3#/var/www/db/uguu.sq3#g' /var/www/uguu/checkdb.sh 
++    sed -i 's#/path/to/db/uguu.sq3#/var/www/db/uguu.sq3#g' /var/www/uguu/checkdb.sh
 +
 +# Add scripts to cron
 +RUN echo "0,30 * * * * bash /var/www/uguu/checkfiles.sh" >> /var/spool/cron/crontabs/www-data && \
 +    echo "0,30 * * * * bash /var/www/uguu/checkdb.sh" >> /var/spool/cron/crontabs/www-data
 +
 +# Copy Nginx Server conf
 +COPY docker/uguu.conf /etc/nginx/http.d/
 +
 +# Copy SSL certs
 +COPY docker/ssl /etc/ssl
 +
 +# Copy Uguu config
- COPY dist.json /var/www/uguu/dist.json 
++COPY dist.json /var/www/uguu/dist.json
 +
 +# Give permissions to www-data
 +RUN chown -R www-data:www-data /run /var/lib/php8 /var/lib/nginx /var/log/nginx /var/log/php8 /etc/nginx /etc/php8
  
 -RUN echo "0,30 * * * * bash /var/www/uguu/checkfiles.sh" >> /var/spool/cron/crontabs/root && \
 -    echo "0,30 * * * * bash /var/www/uguu/checkdb.sh" >> /var/spool/cron/crontabs/root
 -      
 -COPY docker/uguu.conf /etc/nginx/conf.d/
 -     
 -COPY dist.json /var/www/uguu/_dist.json 
 +# Change user to www-data
 +USER www-data
  
 +# Expose port 80 from the container
  EXPOSE 80
  
 -ENTRYPOINT [ "bash", "/var/www/docker-entrypoint.sh" ]
 +# Load entrypoint
- ENTRYPOINT [ "bash", "/var/www/docker-entrypoint.sh" ]
++ENTRYPOINT [ "bash", "/var/www/docker-entrypoint.sh" ]