diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | centos/rspamd.spec | 11 | ||||
| -rw-r--r-- | debian/workers.conf | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44a3f7e38..889debe88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ OPTION(ENABLE_URL_INCLUDE "Enable urls in ucl includes (requires libcurl or lib OPTION(NO_SHARED "Build internal libs static [default: OFF]" OFF) OPTION(FORCE_GMIME24 "Link with gmime2.4 [default: OFF]" OFF) OPTION(INSTALL_EXAMPLES "Install examples [default: OFF]" OFF) +OPTION(INSTALL_WEBUI "Install web interface [default: ON]" ON) # Build optimized code for following CPU (default i386) #SET(CPU_TUNE "i686") @@ -920,3 +921,8 @@ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") # Manual pages INSTALL(FILES "doc/rspamd.8" DESTINATION ${MANDIR}/man8) INSTALL(FILES "doc/rspamc.1" DESTINATION ${MANDIR}/man1) + +# Install webui +IF(INSTALL_WEBUI MATCHES "ON") + INSTALL(DIRECTORY "interface/" DESTINATION ${WWWDIR} PATTERN ".git" EXCLUDE) +ENDIF(INSTALL_WEBUI MATCHES "ON")
\ No newline at end of file diff --git a/centos/rspamd.spec b/centos/rspamd.spec index f11d66ec0..13f316ce5 100644 --- a/centos/rspamd.spec +++ b/centos/rspamd.spec @@ -4,6 +4,7 @@ %define rspamd_logdir %{_localstatedir}/log/rspamd %define rspamd_confdir %{_sysconfdir}/rspamd %define rspamd_pluginsdir %{_datadir}/rspamd +%define rspamd_wwwdir %{_datadir}/rspamd/www %if 0%{?suse_version} %define __cmake cmake @@ -13,7 +14,7 @@ %endif Name: rspamd -Version: 0.6.7 +Version: 0.7.0 Release: 1 Summary: Rapid spam filtering system Group: System Environment/Daemons @@ -46,7 +47,7 @@ Requires(preun): chkconfig, initscripts Requires(postun): initscripts %endif -Source0: https://rspamd.com/downloads/%{name}-%{version}.tar.gz +Source0: https://rspamd.com/downloads/%{name}-%{version}.tar.xz %if 0%{?suse_version} %if 0%{?suse_version} >= 1300 Source1: %{name}.service @@ -191,6 +192,7 @@ fi %dir %{rspamd_confdir} %dir %{rspamd_pluginsdir}/lua %dir %{rspamd_pluginsdir} +%dir %{rspamd_wwwdir} %config(noreplace) %{rspamd_confdir}/2tld.inc %config(noreplace) %{rspamd_confdir}/surbl-whitelist.inc %{rspamd_pluginsdir}/lua/forged_recipients.lua @@ -204,6 +206,7 @@ fi %{rspamd_pluginsdir}/lua/trie.lua %{rspamd_pluginsdir}/lua/emails.lua %{rspamd_pluginsdir}/lua/ip_score.lua +%{rspamd_pluginsdir}/lua/settings.lua %{rspamd_confdir}/lua/regexp/drugs.lua %{rspamd_confdir}/lua/regexp/fraud.lua %{rspamd_confdir}/lua/regexp/headers.lua @@ -211,8 +214,12 @@ fi %{rspamd_confdir}/lua/rspamd.lua %{rspamd_confdir}/lua/hfilter.lua %{rspamd_confdir}/lua/rspamd.classifiers.lua +%{rspamd_wwwdir}/* %changelog +* Mon Sep 1 2014 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.7.0-1 +- Update to 0.7.0 + * Fri Jan 10 2014 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.6.7-1 - Update to 0.6.7. diff --git a/debian/workers.conf b/debian/workers.conf index 1d59010da..5cb921f3f 100644 --- a/debian/workers.conf +++ b/debian/workers.conf @@ -16,4 +16,5 @@ worker { bind_socket = "systemd:2"; password = "q1"; secure_ip = "127.0.0.1"; + static_dir = "${WWWDIR}"; } |