diff --git a/conf/nginx.conf b/conf/nginx.conf index a441f46..672f768 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,7 +3,7 @@ location ^~ __PATH__/ { # Path to source alias __FINALPATH__/public/; - + # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; @@ -13,7 +13,7 @@ location ^~ __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; - + try_files $uri $uri/ @monica; location ~ \.php { fastcgi_split_path_info ^(.+?\.php)(/.*)$; @@ -37,8 +37,7 @@ location @monica { rewrite .well-known/security.txt$ __PATH__/security.txt permanent; # Old carddav url - rewrite carddav/(.*) __PATH__/dav/$1 permanent; + rewrite carddav/(.*) __PATH__/dav?/$1 permanent; # rewrite all to index.php - rewrite ^(.*)$ __PATH__/index.php/$1 last; } diff --git a/scripts/install b/scripts/install index f2dc7ba..5037db3 100755 --- a/scripts/install +++ b/scripts/install @@ -141,7 +141,6 @@ ynh_replace_string --match_string="language" --replace_string="$language" --targ ynh_script_progression --message="Deploying..." pushd "$final_path" - php$phpversion artisan monica:update --force php$phpversion artisan setup:production --email=$email --password=$password -vvv -n php$phpversion artisan passport:client --password -n > key.txt mobile_id=$( cd $final_path && tail -2 key.txt | head -1 | cut -c 12- )