diff --git a/apache/hooks/init b/apache/hooks/init index 2809ebc..4a5609f 100755 --- a/apache/hooks/init +++ b/apache/hooks/init @@ -12,45 +12,10 @@ . lib/common -APACHE_LOG_DIR=/var/log/apache2 set -e - -cat < - -RewriteEngine On - -RewriteCond %{HTTPS} off -RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] - -EOF - rm -fv "$SERVICE_CONFIGSTORE/etc/apache2/sites-enabled/"*".conf" -cat < - ServerAdmin webmaster@localhost - DocumentRoot /var/www/html - - - Options FollowSymLinks - AllowOverride None - - - - Options Indexes FollowSymLinks MultiViews - AllowOverride all - Order allow,deny - allow from all - - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - -EOF - ssh_tunnel_cfg=$(options-get ssh-tunnel 2>/dev/null) || true if [ "$ssh_tunnel_cfg" ]; then apache_ssh_tunnel "$ssh_tunnel_cfg"