From a74e29affae4a882fa203655b047634dfe224dc8 Mon Sep 17 00:00:00 2001 From: Chris Rienzo Date: Tue, 4 Nov 2014 15:18:11 -0500 Subject: [PATCH] added mod_graylog2 and mod_mongo to RPM package. Added graylog.conf.xml to vanilla config, but disabled in modules.conf.xml --- .../autoload_configs/graylog2.conf.xml | 24 ++++++++++++ .../vanilla/autoload_configs/modules.conf.xml | 2 + freeswitch.spec | 39 ++++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 conf/vanilla/autoload_configs/graylog2.conf.xml diff --git a/conf/vanilla/autoload_configs/graylog2.conf.xml b/conf/vanilla/autoload_configs/graylog2.conf.xml new file mode 100644 index 0000000000..0a05482bf8 --- /dev/null +++ b/conf/vanilla/autoload_configs/graylog2.conf.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml index e5a297e8af..092372d68c 100644 --- a/conf/vanilla/autoload_configs/modules.conf.xml +++ b/conf/vanilla/autoload_configs/modules.conf.xml @@ -3,6 +3,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/freeswitch.spec b/freeswitch.spec index 37cf8111b9..08596a8f4f 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -482,6 +482,14 @@ is a "high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load." +%package application-mongo +Summary: FreeSWITCH mod_mongo +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description application-mongo +Provides FreeSWITCH mod_mongo, which implements an API interface to mongodb. + %package application-nibblebill Summary: FreeSWITCH mod_nibblebill Group: System/Libraries @@ -1028,6 +1036,18 @@ BuildRequires: net-snmp-devel %description event-snmp SNMP stats reporter for the FreeSWITCH open source telephony platform +###################################################################################################################### +# FreeSWITCH Logger Modules +###################################################################################################################### + +%package logger-graylog2 +Summary: GELF logger for Graylog2 and Logstash +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description logger-graylog2 +GELF logger for Graylog2 and Logstash + ###################################################################################################################### # FreeSWITCH Media Format Modules ###################################################################################################################### @@ -1371,7 +1391,7 @@ APPLICATION_MODULES_DE+="applications/mod_esl" APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/mod_fsv applications/mod_hash \ applications/mod_httapi applications/mod_http_cache applications/mod_lcr applications/mod_limit \ - applications/mod_memcache applications/mod_nibblebill applications/mod_redis applications/mod_rss" + applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_redis applications/mod_rss" APPLICATION_MODULES_SZ="applications/mod_sms applications/mod_snapshot applications/mod_snom applications/mod_soundtouch \ applications/mod_spandsp applications/mod_spy applications/mod_stress \ @@ -1463,7 +1483,7 @@ LANGUAGES_MODULES="languages/mod_lua languages/mod_perl languages/mod_python " # Logging Modules # ###################################################################################################################### -LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" +LOGGERS_MODULES="loggers/mod_console loggers/mod_graylog2 loggers/mod_logfile loggers/mod_syslog" ###################################################################################################################### # @@ -1807,6 +1827,7 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/fax.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/fifo.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/format_cdr.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/graylog2.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/hash.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/httapi.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/http_cache.conf.xml @@ -1968,6 +1989,9 @@ fi %files application-memcache %{MODINSTDIR}/mod_memcache.so* +%files application-mongo +%{MODINSTDIR}/mod_mongo.so* + %files application-nibblebill %{MODINSTDIR}/mod_nibblebill.so* @@ -2339,6 +2363,15 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/lang/sv/vm/*.xml %{MODINSTDIR}/mod_say_sv.so* +###################################################################################################################### +# +# Logger Modules +# +###################################################################################################################### + +%files logger-graylog2 +%{MODINSTDIR}/mod_graylog2.so* + ###################################################################################################################### # # Timer Modules @@ -2371,6 +2404,8 @@ fi # ###################################################################################################################### %changelog +* Tue Nov 04 2014 - crienzo@grasshopper.com +- add mod_graylog2 and mod_mongo * Thu Sep 11 2014 - krice@freeswitch.org - add and fix mod_verto and mod_rtc * Mon Jun 02 2014 - krice@freeswitch.org