Revert "letsencrypt: fix renewal with httpsonly enabled"

This reverts commit a4851dc.
nextcloud · Sep 25, 2021 · e1d02e1 · e1d02e1
1 parent eef7b09
commit e1d02e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh
@@ -186,7 +186,6 @@ EOF
   DocumentRoot /var/www/nextcloud
   <IfModule mod_rewrite.c>
     RewriteEngine On
-    RewriteRule ^.well-known/acme-challenge/ - [L]
     RewriteCond %{HTTPS} !=on
     RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
   </IfModule>

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 
-[v1.39.13](https://github.com/nextcloud/nextcloudpi/commit/6dbc76e) (2021-09-23) ncp-web: make letsencrypt detection more robust
+[v1.39.14](https://github.com/nextcloud/nextcloudpi/commit/10f3ddb) (2021-09-25) Revert "letsencrypt: fix renewal with httpsonly enabled"
+
+[v1.39.13](https://github.com/nextcloud/nextcloudpi/commit/eef7b09) (2021-09-23) ncp-web: make letsencrypt detection more robust
 
 [v1.39.12](https://github.com/nextcloud/nextcloudpi/commit/814569b) (2021-09-22) fix junk in overwrite.cli.url because of Redis not being yet ready
 

diff --git a/updates/1.40.0.sh b/updates/1.40.0.sh
@@ -11,13 +11,12 @@ source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE
 # update ncp-restore
 install_app nc-restore
 
-# fix letsencrypt with httpsonly enabled
+# revert - fix letsencrypt with httpsonly enabled
   cat > /etc/apache2/sites-available/000-default.conf <<'EOF'
 <VirtualHost _default_:80>
   DocumentRoot /var/www/nextcloud
   <IfModule mod_rewrite.c>
     RewriteEngine On
-    RewriteRule ^.well-known/acme-challenge/ - [L]
     RewriteCond %{HTTPS} !=on
     RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
   </IfModule>
@@ -31,6 +30,8 @@ install_app nc-restore
   </Directory>
 </VirtualHost>
 EOF
+  apachectl -k graceful
+
 
 # docker images only
 [[ -f /.docker-image ]] && {