Merge pull request turnkeylinux-apps#1 from JedMeister/update-apache-…

…confs-jessie Update apache confs jessie
Dude4Linux · May 19, 2015 · cd7c34f · cd7c34f
2 parents 1d5551f + b64f161
commit cd7c34f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/conf.d/main b/conf.d/main
@@ -111,7 +111,7 @@ $MYSQL_BATCH --database=$DB_NAME --execute "UPDATE block SET region = '-1' WHERE
 /etc/init.d/mysql stop
 
 # configure apache
-a2dissite default
+a2dissite 000-default
 a2ensite drupal7
 a2enmod rewrite
 

diff --git a/overlay/etc/apache2/sites-available/drupal7 → .../etc/apache2/sites-available/drupal7.conf b/overlay/etc/apache2/sites-available/drupal7 → .../etc/apache2/sites-available/drupal7.conf
@@ -1,5 +1,4 @@
-NameVirtualHost *:80
-NameVirtualHost *:443
+ServerName localhost
 
 <VirtualHost *:80>
     UseCanonicalName Off
@@ -17,7 +16,6 @@ NameVirtualHost *:443
 <Directory /var/www/drupal7/>
     Options +FollowSymLinks
     AllowOverride All
-    order allow,deny
-    allow from all
+Require all granted
 </Directory>