From 5d2835e94606aa24e0d299bd6e5496206cd1495b Mon Sep 17 00:00:00 2001 From: Marco Dings Date: Tue, 31 Jul 2018 18:32:06 +0200 Subject: [PATCH 1/2] Allow downloading of importing templates To import data into invoices issues etc a certain format needs to befollowed, akkaunting provides examples in the form of .xlsx and .csv file under the public directory. Unfortunately they are blocked --- nginx/akaunting | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/akaunting b/nginx/akaunting index 9424d61..b021772 100644 --- a/nginx/akaunting +++ b/nginx/akaunting @@ -6,7 +6,7 @@ server { root /var/www/akaunting/root; # Static files - location ~ ^/(public|modules|vendor)/(.*\.(ico|gif|jpg|jpeg|png|js|css|less|sass|font|woff|woff2|eot|ttf|svg))$ { + location ~ ^/(public|modules|vendor)/(.*\.(ico|gif|jpg|jpeg|png|js|css|less|sass|font|woff|woff2|eot|ttf|svg|csv|xls|xlsx))$ { alias /var/www/akaunting/$1/$2; } From ddd2ba62805dedb429313b8c1abe7c548165721d Mon Sep 17 00:00:00 2001 From: Marco Dings Date: Tue, 31 Jul 2018 23:34:26 +0200 Subject: [PATCH 2/2] Update entrypoint.sh after a restart of the container i would face lockout of the container akaunting_1 | Waiting for php-fpm akaunting_1 | == MYSQL_DEFAULT_PASSWORD akaunting_1 | ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES) set -e seemed to be active in my setup, causing the script to terminate early termination was not desired as after a restart failing access to mysql the entrypointscript was supposed to continue based on the error status. --- entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 30168d4..0b1cb81 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -133,6 +133,9 @@ wait_for_php_fpm # MySQL # ################## +# force set to be +e so error do NEVER terminate the script and errorhandling can be done here +set +e + # Check if password was changed echo "\ [client]