summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-20 10:09:02 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-20 10:09:02 +0100
commit24ad3e349ffbd1b09392cc9bc3d90b521503c51b (patch)
tree510ced8b7d925f46292ee872d04aaa25a9d0a17f
parente5a6aa37a37199c3ebbcb1e0ddf2e4710639280b (diff)
parente405bce6ab07f385e32c0d885b1d51ca96bf1ff5 (diff)
Merge branch 'develop'
-rw-r--r--app/controllers/gemeinschaft_setups_controller.rb7
-rw-r--r--misc/freeswitch/scripts/ini/sofia.ini2
2 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb
index cafb8a3..e871862 100644
--- a/app/controllers/gemeinschaft_setups_controller.rb
+++ b/app/controllers/gemeinschaft_setups_controller.rb
@@ -26,6 +26,11 @@ class GemeinschaftSetupsController < ApplicationController
:language_id => @gemeinschaft_setup.language_id,
:description => t('gemeinschaft_setups.initial_setup.super_tenant_description'),
)
+
+ # GsNode
+ GsNode.create(:name => 'Homebase', :ip_address => @gemeinschaft_setup.sip_domain.host,
+ :push_updates_to => false, :accepts_updates_from => false,
+ :site => 'Homebase', :element_name => 'Homebase')
# Admin
user = @gemeinschaft_setup.user
@@ -35,7 +40,7 @@ class GemeinschaftSetupsController < ApplicationController
# Create the Super-Tenant's group:
super_tenant_super_admin_group = super_tenant.user_groups.create(:name => t('gemeinschaft_setups.initial_setup.super_admin_group_name'))
super_tenant_super_admin_group.user_group_memberships.create(:user_id => user.id)
-
+
# Auto-Login:
session[:user_id] = user.id
diff --git a/misc/freeswitch/scripts/ini/sofia.ini b/misc/freeswitch/scripts/ini/sofia.ini
index 9c73990..b3f1149 100644
--- a/misc/freeswitch/scripts/ini/sofia.ini
+++ b/misc/freeswitch/scripts/ini/sofia.ini
@@ -51,5 +51,5 @@ rtp-rewrite-timestamps = true
inbound-use-callid-as-uuid = false
outbound-use-callid-as-uuid = false
context = default
-record-template = /${record_file}
+record-template = ${user_name}_${uuid}.wav
odbc-dsn = gemeinschaft:gemeinschaft:gemeinschaft