Automatic commit of package [ipasserelle-im] release [0.2.18-1].

Created by command:

/usr/bin/tito tag

.tito/packages/.readme

@@ -0,0 +1,3 @@
+the .tito/packages directory contains metadata files
+named after their packages. Each file has the latest tagged
+version and the project's relative directory.

.tito/packages/ipasserelle-im

@@ -0,0 +1 @@
+0.2.18-1 ./

.tito/releasers.conf

@@ -0,0 +1 @@
+../../tito_libs/releasers.conf

.tito/tito.props

@@ -0,0 +1,6 @@
+[buildconfig]
+builder = tito.builder.Builder
+tagger = tito.tagger.VersionTagger
+changelog_do_not_remove_cherrypick = 0
+changelog_format = %s (%ae)
+lib_dir = ../tito_libs

CHANGELOG

@@ -1,29 +0,0 @@
-commit f95caac4a514eafe48984122de1243d7785255cf
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu May 24 09:52:29 2012 +0200
-
-    revert mod_muc to mnesia
-
-commit 688069c291c754eb1cbeb6c75c0c821199c043a1
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed May 23 18:46:23 2012 +0200
-
-    Enable more ODBC modules available in Ejabberd 2.1.11
-
-commit 6ae2143deecbba879b1bd5017eb8884c4fd38de2
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Tue Apr 24 12:31:29 2012 +0200
-
-    create log dir /var/log/ejabberd.run
-
-commit 0841925c8e3847ac861dd1ff2c848059c7da69cb
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Mar 30 10:49:57 2012 +0200
-
-    DisplayName in LDAP Roster
-
-commit af6fdb290f8967f248670fbcfab2bb2553bbcb3e
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Mar 14 22:30:54 2012 +0100
-
-    initial import

createlinks

@@ -24,6 +24,7 @@ event_link("ejabberd-init-domain", 'ipasserelle-update', "60");
 event_link("ejabberd-init-domain", 'webapps-update', "60");
 
 safe_symlink("restart", "root/etc/e-smith/events/ejabberd-update/services2adjust/ejabberd");
+safe_symlink("sighup", "root/etc/e-smith/events/ssl-update/services2adjust/ejabberd");
 safe_symlink("adjust", "root/etc/e-smith/events/ejabberd-update/services2adjust/masq");
 safe_symlink("sigusr1", "root/etc/e-smith/events/ejabberd-update/services2adjust/httpd-e-smith");
 

ipasserelle-im.spec

@@ -1,12 +1,8 @@
-%define version 0.2.12
-%define release 1
-%define name ipasserelle-im
-
-
 Summary: Meta-Package to add Instant Messaging capabilities to your iPasserelle
-Name: %{name}
-Version: %{version}
-Release: %{release}%{?dist}
+Name: ipasserelle-im
+Version: 0.2.18
+Release: 1%{?dist}
+Epoch: 9
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
@@ -21,7 +17,6 @@ Provides: smeserver-ejabberd
 Requires: ipasserelle-base
 Requires: ejabberd >= 2.1.11
 Requires: ejabberd-modules
-Requires: smeserver-spectrum
 Requires: smeserver-webapps-common
 Requires: smeserver-jappix >= 0.1-3
 Requires: smeserver-pam_cas
@@ -31,6 +26,25 @@ Meta package to configure Instant Messaging features
 on your iPasserelle.
 
 %changelog
+* Tue Apr 14 2020 Daniel Berteaud <daniel@firewall-services.com> 0.2.18-1
+- new package built with tito
+- Add CORS headers for the im vhost
+* Sat Jan 23 2016 Daniel Berteaud <daniel@firewall-services.com> 0.2.17-1
+- Don't force SSL for acme challenges URI
+- Reload during ssl-update
+
+* Fri Jan 31 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.16-1
+- Raise trafic limit
+
+* Wed Nov 13 2013 Daniel Berteaud <daniel@firewall-services.com> 0.2.15-1
+- x86_64 compatibility
+
+* Wed Nov 13 2013 Daniel Berteaud <daniel@firewall-services.com> 0.2.14-1
+- Make spectrum optional
+
+* Tue Nov 12 2013 Daniel Berteaud <daniel@firewall-services.com> 0.2.13-1
+- New branch for SME9
+
 * Thu Oct 17 2013 Daniel Berteaud <daniel@firewall-services.com> 0.2.12-1
 - Update the logo used by Jappix in the portal
 
@@ -120,7 +134,6 @@ perl createlinks
     --dir '/var/log/ejabberd.run' 'attr(0750,smelog,root)' \
     --dir '/var/service/ejabberd/ssl' 'attr(0750,root,ejabberd)' \
   > %{name}-%{version}-filelist
-echo "%doc CHANGELOG" >> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)

root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf

@@ -3,11 +3,11 @@
 % Users can use c2s connections:
 {access, c2s, [{allow, all}]}.
 
-% Set shaper with name "normal" to limit traffic speed to 10000B/s
-{shaper, normal, {maxrate, 10000}}.
+% Set shaper with name "normal" to limit traffic speed to 1000000B/s
+{shaper, normal, {maxrate, 1000000}}.
 
-% Set shaper with name "fast" to limit traffic speed to 500000B/s
-{shaper, fast, {maxrate, 500000}}.
+% Set shaper with name "fast" to limit traffic speed to 10000000B/s
+{shaper, fast, {maxrate, 10000000}}.
 
 % For all users except admins used "normal" shaper
 {access, c2s_shaper, [{none, admin},

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Ejabberd

@@ -16,6 +16,7 @@ if ( $port ne ($modSSL{'TCPPort'} || '443')){
     #====================================================================
 
     RewriteEngine on
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
     RewriteRule ^/(.*|\$) https://%{HTTP_HOST}/\$1 \[L,R\]
 
 EOF
@@ -28,6 +29,8 @@ EOF
     ProxyPass / http://localhost:5280/
     ProxyPassReverse / http://localhost:5280/
 
+    Header set Access-Control-Allow-Origin "*"
+
     <Location />
         order deny,allow
         deny from all

root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ejabberd.pm

@@ -220,12 +220,14 @@ sub change_settings {
 
     $rec = $db->get('spectrum');
 
-    foreach my $proto (@transports){
-        if (grep ($proto, @gateways)){
-            $rec->set_prop("$proto",'enabled');
-        }
-        else{
-            $rec->set_prop("$proto",'disabled');
+    if ($rec){
+        foreach my $proto (@transports){
+            if (grep ($proto, @gateways)){
+                $rec->set_prop("$proto",'enabled');
+            }
+            else{
+                $rec->set_prop("$proto",'disabled');
+            }
         }
     }
 
@@ -266,6 +268,8 @@ sub print_gateways
     my ($self) = @_;
     my $q = $self->{cgi};
 
+    my $spectrum = $db->get('spectrum') || return undef;
+
     print "<tr><td class=\"sme-noborders-label\">",
         $self->localise('LABEL_GATEWAYS'),
         "</td><td>\n";
@@ -275,7 +279,6 @@ sub print_gateways
             esmith::cgi::genSmallCell($q, $self->localise('PROTOCOL'),"header"),
             esmith::cgi::genSmallCell($q, $self->localise('STATUS'),"header"),
         );
-    my $spectrum = $db->get('spectrum');
 
     foreach my $proto (@transports){
         my $status = $spectrum->prop($proto) || 'disabled';

root/var/service/ejabberd/run

@@ -27,19 +27,32 @@ SASL_LOG_PATH=/var/log/ejabberd/sasl.log
 export SASL_LOG_PATH
 EJABBERD_LOG_PATH=/var/log/ejabberd/ejabberd.log
 export EJABBERD_LOG_PATH
-EJABBERD_SO_PATH=/usr/lib/ejabberd/priv/lib
+if [ -d /usr/lib64/ejabberd/priv/lib ]; then
+    EJABBERD_SO_PATH=/usr/lib64/ejabberd/priv/lib
+else
+    EJABBERD_SO_PATH=/usr/lib/ejabberd/priv/lib
+fi
 export EJABBERD_SO_PATH
 EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.cfg
 export EJABBERD_CONFIG_PATH
-EJABBERD_MSGS_PATH=/usr/lib/ejabberd/priv/msgs
+if [ -d /usr/lib64/ejabberd/priv/msgs ]; then
+    EJABBERD_MSGS_PATH=/usr/lib64/ejabberd/priv/msgs
+else
+    EJABBERD_MSGS_PATH=/usr/lib/ejabberd/priv/msgs
+fi
 export EJABBERD_MSGS_PATH
 EJABBERD_DB=/var/lib/ejabberd/spool
 export EJABBERD_DB
 HOME=/var/lib/ejabberd
 export HOME
+if [ -d /usr/lib64/ejabberd/ebin ]; then
+    EBIN=/usr/lib64/ejabberd/ebin
+else
+    EBIN=/usr/lib/ejabberd/ebin
+fi
 
 exec /usr/local/bin/setuidgid ejabberd \
-    erl -pa /usr/lib/ejabberd/ebin \
+    erl -pa $EBIN \
       -noinput \
       -smp auto +K false +P 250000 \
       -sname ejabberd \
@@ -49,4 +62,4 @@ exec /usr/local/bin/setuidgid ejabberd \
       -ejabberd config \"$EJABBERD_CONFIG_PATH\" \
                 log_path \"$EJABBERD_LOG_PATH\" \
       -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} 
-      
+