From d7ff880dfaa1f5462ee0cb0dd6260d236095a3e3 Mon Sep 17 00:00:00 2001
From: Bruno Cesar Ribas <brunoribas@gmail.com>
Date: Wed, 22 Aug 2018 00:38:15 -0300
Subject: tools/000-boca.conf: Adds configuration specific for php-fpm

Signed-off-by: Bruno Cesar Ribas <brunoribas@gmail.com>
---
 tools/000-boca.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tools/000-boca.conf')

diff --git a/tools/000-boca.conf b/tools/000-boca.conf
index 66c62fe..81df368 100644
--- a/tools/000-boca.conf
+++ b/tools/000-boca.conf
@@ -1,3 +1,12 @@
+<Directory /usr/lib/cgi-bin>
+	Require all granted
+</Directory>
+<IfModule mod_fastcgi.c>
+	AddHandler php7-fcgi .php
+	Action php7-fcgi /php7-fcgi
+	Alias /php7-fcgi /usr/lib/cgi-bin/php7-fcgi
+	FastCgiExternalServer /usr/lib/cgi-bin/php7-fcgi -socket /var/run/php/php7.0-fpm.sock -idle-timeout 120 -pass-header Authorization
+</IfModule>
 <Directory /var/www/boca/src>
        AllowOverride Options AuthConfig Limit
        Order Allow,Deny
-- 
cgit v1.2.3


From 45890a5029d0fb65cd2d15689c7c173cc0dae61b Mon Sep 17 00:00:00 2001
From: Bruno Cesar Ribas <brunoribas@gmail.com>
Date: Wed, 22 Aug 2018 15:57:52 -0300
Subject: tools/000-boca.conf: Update to match current apache2 guidelines

Signed-off-by: Bruno Cesar Ribas <brunoribas@gmail.com>
---
 tools/000-boca.conf | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

(limited to 'tools/000-boca.conf')

diff --git a/tools/000-boca.conf b/tools/000-boca.conf
index 81df368..2ea68d9 100644
--- a/tools/000-boca.conf
+++ b/tools/000-boca.conf
@@ -1,24 +1,21 @@
-<Directory /usr/lib/cgi-bin>
-	Require all granted
-</Directory>
-<IfModule mod_fastcgi.c>
-	AddHandler php7-fcgi .php
-	Action php7-fcgi /php7-fcgi
-	Alias /php7-fcgi /usr/lib/cgi-bin/php7-fcgi
-	FastCgiExternalServer /usr/lib/cgi-bin/php7-fcgi -socket /var/run/php/php7.0-fpm.sock -idle-timeout 120 -pass-header Authorization
-</IfModule>
-<Directory /var/www/boca/src>
-       AllowOverride Options AuthConfig Limit
-       Order Allow,Deny
-       Allow from all
-       AddDefaultCharset utf-8
-</Directory>
-<Directory /var/www/boca/src/private>
-       AllowOverride Options AuthConfig Limit
-       Deny from all
-</Directory>
-<Directory /var/www/boca>
-       AllowOverride Options AuthConfig Limit
-       Deny from all
-</Directory>
-Alias /boca /var/www/boca/src
+<VirtualHost *:80>
+
+  ServerAdmin boca@bombonera.org
+  DocumentRoot /var/www/boca
+  <Directory "/var/www/boca/src">
+         AllowOverride Options AuthConfig Limit
+         Order Allow,Deny
+         Allow from all
+         AddDefaultCharset utf-8
+  </Directory>
+  <Directory "/var/www/boca/src/private">
+         AllowOverride Options AuthConfig Limit
+         Deny from all
+  </Directory>
+  <Directory /var/www/boca>
+         AllowOverride Options AuthConfig Limit
+         Deny from all
+  </Directory>
+  Alias /boca /var/www/boca/src
+
+</VirtualHost>
-- 
cgit v1.2.3