add libdbi, enables mod_vhostdb_dbi

diff --git a/lighttpd.spec b/lighttpd.spec
index 6ebcfb2cf04a9a763200c7cd6a015be22bad65cb..125826a8cc772a6a6f19d0fba0dc651819b00cf1 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -1,15 +1,16 @@
 # TODO:
-# - provide or autogenerate self signed cert in post, so after installing
+# - provide or autogenerated self signed cert in post, so after installing
 #   lighttpd-ssl server will still work
 # - patch with mod_websocket: https://github.com/Juniper/lighttpd-for-juise
 # - lighttpd-mod_fd_transfer: https://redmine.lighttpd.net/boards/3/topics/4992
-# - add db specific mod_vhostdb_* - packages
+# - add db specific mod_vhostdb_* sub-packages
 #
 # Conditional build:
 %bcond_with            tests           # build with tests
 %bcond_without xattr           # support of extended attributes
 %bcond_without ipv6            # IPv4-only version (doesn't require IPv6 in kernel)
 %bcond_without largefile       # largefile support (see notes above)
+%bcond_without dbi             # libdbi, enables mod_vhostdb_dbi
 %bcond_without ssl             # ssl support
 %bcond_without mysql           # mysql support in mod_mysql_vhost, mod_vhostdb_mysql
 %bcond_without geoip           # GeoIP support
@@ -132,6 +133,7 @@ BuildRequires:      fcgi-devel
 %{?with_gamin:BuildRequires:   gamin-devel}
 %{?with_storage_gdbm:BuildRequires:    gdbm-devel}
 %{?with_krb5:BuildRequires:    krb5-devel}
+%{?with_dbi:BuildRequires:     libdbi-devel}
 %{?with_storage_memcached:BuildRequires:       libmemcached-devel}
 BuildRequires: libtool
 BuildRequires: libuuid-devel
@@ -981,6 +983,7 @@ fi
        %{!?with_largefile:--disable-lfs} \
        %{?with_valgrind:--with-valgrind} \
        %{?with_xattr:--with-attr} \
+       %{?with_dbi:--with-dbi} \
        %{?with_krb5:--with-krb5} \
        %{?with_geoip:--with-geoip} \
        %{?with_mysql:--with-mysql} \
@@ -1504,6 +1507,10 @@ fi
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_vhostdb.conf
 %attr(755,root,root) %{pkglibdir}/mod_vhostdb.so
+# TODO: subpackages
+%if %{with dbi}
+%attr(755,root,root) %{pkglibdir}/mod_vhostdb_dbi.so
+%endif
 %if %{with ldap}
 %attr(755,root,root) %{pkglibdir}/mod_vhostdb_ldap.so
 %endif

diff --git a/mod_vhostdb.conf b/mod_vhostdb.conf
index d5b71729c9aedc362b0d34aff7863291c0425fe2..71f24dbf08baf7f2072c4d7da53a3f509e534511 100644 (file)
--- a/mod_vhostdb.conf
+++ b/mod_vhostdb.conf
@@ -4,6 +4,7 @@
 
 server.modules += (
        "mod_vhostdb",
+#      "mod_vhostdb_dbi",
 #      "mod_vhostdb_ldap",
 #      "mod_vhostdb_mysql",
 )