From 001f2a9d9c1cf63607c3abfb9cdeaa75fa39de6b Mon Sep 17 00:00:00 2001 From: Christer Edwards Date: Wed, 29 Jan 2014 19:12:47 -0700 Subject: [PATCH 1/2] added initial FreeBSD support --- apache/map.jinja | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apache/map.jinja b/apache/map.jinja index 7573d64..3ce6c8b 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -15,10 +15,22 @@ 'service': 'httpd', 'mod_wsgi': 'mod_wsgi', + 'wsgi_conf': '/etc/httpd/conf.d/wsgi.conf', 'vhostdir': '/etc/httpd/conf.d', 'confdir': '/etc/httpd/conf.d', 'logdir': '/var/log/httpd', 'wwwdir': '/var/www', }, + 'FreeBSD': { + 'server': 'apache22', + 'service': 'apache22', + + 'mod_wsgi': 'ap22-mod_wsgi3', + + 'vhostdir': '/usr/local/etc/apache22/Includes', + 'confdir': '/usr/local/etc/apache22/Includes', + 'logdir': '/var/log/', + 'wwwdir': '/usr/local/www/apache22/', + }, }, merge=salt['pillar.get']('apache:lookup')) %} From 36051f4353ebfd972460fe5d569cc96e93ea8318 Mon Sep 17 00:00:00 2001 From: Christer Edwards Date: Wed, 29 Jan 2014 19:14:50 -0700 Subject: [PATCH 2/2] removed unneeded wsgi_path --- apache/map.jinja | 1 - 1 file changed, 1 deletion(-) diff --git a/apache/map.jinja b/apache/map.jinja index 3ce6c8b..1685548 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -15,7 +15,6 @@ 'service': 'httpd', 'mod_wsgi': 'mod_wsgi', - 'wsgi_conf': '/etc/httpd/conf.d/wsgi.conf', 'vhostdir': '/etc/httpd/conf.d', 'confdir': '/etc/httpd/conf.d',