Version bump + various cleanups

4 files changed, 22 insertions, 43 deletions

diff --git a/net-mail/sympa/files/sympa-apache.conf b/net-mail/sympa/files/sympa-apache.conf
index 94098f8..1d652c1 100644
--- a/net-mail/sympa/files/sympa-apache.conf
+++ b/net-mail/sympa/files/sympa-apache.conf
@@ -1,11 +1,14 @@
-Alias /static-sympa		/var/spool/sympa/static_content
+LoadModule alias_module modules/mod_alias.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+
+<Location /sympa>
+    SetHandler "proxy:unix:/var/run/sympa.sock|fcgi://"
+    Require all granted
+</Location>
 
-<IfDefine SYMPA>
-	ScriptAlias /sympa /usr/libexec/sympa/wwsympa-wrapper.fcgi
-	<IfDefine FASTCGI>
-		FastCgiServer /usr/libexec/sympa/wwsympa-wrapper.fcgi -processes 2
-		<Location /sympa>
-		SetHandler fastcgi-script
-		</Location>
-	</Ifdefine>
-</Ifdefine>
+<Location /static-sympa>
+    Require all granted
+</Location>
+
+Alias /static-sympa		/var/spool/sympa/static_content
diff --git a/net-mail/sympa/files/sympa-apache_soap.conf b/net-mail/sympa/files/sympa-apache_soap.conf
deleted file mode 100644
index 553df34..0000000
--- a/net-mail/sympa/files/sympa-apache_soap.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Alias /static-sympa		/var/spool/sympa/static_content
-
-<IfDefine SYMPA_SOAP>
-	ScriptAlias /sympa /usr/libexec/sympa/sympa_soap_server-wrapper.fcgi
-	<IfDefine FASTCGI>
-		FastCgiServer /usr/libexec/sympa/sympa_soap_server-wrapper.fcgi -processes 2
-		<Location /sympa>
-		SetHandler fastcgi-script
-		</Location>
-	</Ifdefine>
-</Ifdefine>
diff --git a/net-mail/sympa/files/sympa-lighttpd.conf b/net-mail/sympa/files/sympa-lighttpd.conf
index 7023086..ce072c5 100644
--- a/net-mail/sympa/files/sympa-lighttpd.conf
+++ b/net-mail/sympa/files/sympa-lighttpd.conf
@@ -1,14 +1,15 @@
 server.modules += ("mod_fastcgi")
+server.modules += ("mod_alias")
 
 alias.url += ( "/static-sympa/" => "/var/spool/sympa/static_content/" )
 
 $HTTP["url"] =~ "^/sympa" {
-fastcgi.server = ( "/sympa" =>
-			((	"check-local"	=>	"disable",
-				"bin-path"	=>	"/usr/libexec/sympa/wwsympa-wrapper.fcgi",
-				"socket"	=>	"/var/run/lighttpd/sympa.sock",
-				"max-procs"	=> 	2,
-				"idle-timeout"	=> 	20,
-			))
-		)
+	fastcgi.server = ( "/sympa" =>
+		((	"check-local"	=>	"disable",
+			"bin-path"	=>	"/usr/libexec/sympa/wwsympa-wrapper.fcgi",
+			"socket"	=>	"/var/run/lighttpd/sympa.sock",
+			"max-procs"	=> 	2,
+			"idle-timeout"	=> 	20,
+		))
+	)
 }
diff --git a/net-mail/sympa/files/sympa-lighttpd_soap.conf b/net-mail/sympa/files/sympa-lighttpd_soap.conf
deleted file mode 100644
index 121114f..0000000
--- a/net-mail/sympa/files/sympa-lighttpd_soap.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server.modules += ("mod_fastcgi")
-
-alias.url += ( "/static-sympa/" => "/var/spool/sympa/static_content/" )
-
-$HTTP["url"] =~ "^/sympa" {
-fastcgi.server = ( "/sympa" =>
-			((	"check-local"	=>	"disable",
-				"bin-path"	=>	"/usr/libexec/sympa/sympa_soap_server-wrapper.fcgi",
-				"socket"	=>	"/var/run/lighttpd/sympa.sock",
-				"max-procs"	=> 	2,
-				"idle-timeout"	=> 	20,
-			))
-		)
-}