diff --git a/defaults/main.yml b/defaults/main.yml index fab7f1ad107358eff1b3cdc2770f844979084112..a5fd0185ffb3ba1fd87916213f349e0ea6a5f68f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,9 +26,6 @@ drupal_post_deploy_tasks: - 'sset system.maintenance_mode 0' - 'cache-rebuild' -letsencrypt_pause_services: - - 'apache2' - fstype_convert: btrfs: 'btrfs-convert --no-progress {{ item.src }}' ext4: 'mkfs.ext4 {{ item.src }}' diff --git a/templates/vhost.conf b/templates/vhost.conf index a3fe378428af83cde3d02500423725c4c49ba574..69c9ad55191d8510ccc52ae9dafbdea897d0987e 100644 --- a/templates/vhost.conf +++ b/templates/vhost.conf @@ -9,8 +9,7 @@ ServerAlias {{ drupal_domain.domain }}{% for alias in drupal_domain.aliases|default([]) %} {{ alias }}{% endfor %} {% endif %} - RewriteEngine on - RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent] + Include /etc/apache2/{{ apache_conf_dir }}/letsencrypt-redirect.conf SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded {% if drupal_domain.apache_log is defined %}