Scott Lawrence wrote:
> I've got updates to sipXsupervisor and the new setup scripts ready to
> check in, but there are a couple of changes needed to how domain-config
> is generated.
>
> I took a stab at the sipXconfig code today, but I don't grok enough to
> make it work...
>
> Basically, I need to make domain-config come out like:
>
> SIP_DOMAIN_NAME : domain.example.com
> SIP_REALM : realm.example.com
> SHARED_SECRET : mySecret
> DEFAULT_LANGUAGE : en
> ALARM_SERVER_URL : https://master.example.com:8092
> SUPERVISOR_PORT : 8092
> CONFIG_HOST : master.example.com
>
>
> Those last two parameters are new - they moved from
> sipxsupervisor-config (and were renamed). For now, the port number can
> be fixed (I suppose ultimately it should be configurable, but I'm not
> concerned with that now). The CONFIG_HOST parameter needs to be the
> fqdn of the sipXconfig host (the master in a cluster).
>
>
>
That should help you for now.
We will clean it up once it's all safely in mainline.
D.
>From 6fd59416a597473028ec7f4a128ac334c0d8dff7 Mon Sep 17 00:00:00 2001
From: dkrzemin <[EMAIL PROTECTED]>
Date: Mon, 20 Oct 2008 08:50:14 -0400
Subject: [PATCH] Modify domain-config generated by sipXconfig.
Add:
SUPERVISOR_PORT : 8092
CONFIG_HOST : master.example.com
TODO: Need to make SUPERVISOR_PORT configurable.
---
sipXconfig/neoconf/etc/commserver/domain-config.vm | 2 ++
sipXconfig/neoconf/etc/sipxconfig.properties.in | 1 +
.../sipxconfig/domain/DomainConfiguration.java | 5 ++++-
.../sipxconfig/domain/DomainManagerImpl.java | 7 ++++++-
.../sipxconfig/domain/DomainConfigurationTest.java | 11 ++++++-----
.../sipxconfig/domain/expected-domain-config | 2 ++
6 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/sipXconfig/neoconf/etc/commserver/domain-config.vm b/sipXconfig/neoconf/etc/commserver/domain-config.vm
index 50f2b1e..c149d1d 100644
--- a/sipXconfig/neoconf/etc/commserver/domain-config.vm
+++ b/sipXconfig/neoconf/etc/commserver/domain-config.vm
@@ -3,3 +3,5 @@ SIP_REALM : ${realm}
SHARED_SECRET : ${domain.SharedSecret}
DEFAULT_LANGUAGE : $language
ALARM_SERVER_URL : https://${domain.Name}:8092
+SUPERVISOR_PORT : 8092
+CONFIG_HOST : ${configServerHost}
diff --git a/sipXconfig/neoconf/etc/sipxconfig.properties.in b/sipXconfig/neoconf/etc/sipxconfig.properties.in
index 7096d2d..1c0b9bb 100644
--- a/sipXconfig/neoconf/etc/sipxconfig.properties.in
+++ b/sipXconfig/neoconf/etc/sipxconfig.properties.in
@@ -47,6 +47,7 @@ registrationContext.hostname=${MY_FULL_HOSTNAME}
domainManagerImpl.authorizationRealm=${SIPXCHANGE_REALM}
domainManagerImpl.alarmServerUrl=https://${MY_FULL_HOSTNAME}:8092
domainManagerImpl.initialDomain=${SIPXCHANGE_DOMAIN_NAME}
+domainManagerImpl.configServerHost=${MY_FULL_HOSTNAME}
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java
index fd0515f..312e13d 100644
--- a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java
+++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java
@@ -19,12 +19,14 @@ public class DomainConfiguration extends TemplateConfigurationFile {
private String m_realm;
private String m_language;
private String m_alarmServerUrl;
+ private String m_configServerHost;
- public void generate(Domain domain, String realm, String language, String alarmServerUrl) {
+ public void generate(Domain domain, String realm, String configServerHost, String language, String alarmServerUrl) {
m_domain = domain;
m_realm = realm;
m_language = language;
m_alarmServerUrl = alarmServerUrl;
+ m_configServerHost = configServerHost;
}
@Override
@@ -34,6 +36,7 @@ public class DomainConfiguration extends TemplateConfigurationFile {
context.put("realm", m_realm);
context.put("language", m_language);
context.put("alarmServerUrl", m_alarmServerUrl);
+ context.put("configServerHost", m_configServerHost);
return context;
}
}
diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java
index 1e1bca6..deff034 100644
--- a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java
+++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java
@@ -30,6 +30,7 @@ public abstract class DomainManagerImpl extends SipxHibernateDaoSupport<Domain>
private String m_alarmServerUrl;
private String m_initialDomain;
private String m_initialAlias;
+ private String m_configServerHost;
/**
* Implemented by Spring AOP
@@ -92,7 +93,7 @@ public abstract class DomainManagerImpl extends SipxHibernateDaoSupport<Domain>
throw new DomainNotInitializedException();
}
DomainConfiguration domainConfiguration = createDomainConfiguration();
- domainConfiguration.generate(existingDomain, m_authorizationRealm,
+ domainConfiguration.generate(existingDomain, m_authorizationRealm, m_configServerHost,
getExistingLocalization().getLanguage(), m_alarmServerUrl);
getReplicationContext().replicate(domainConfiguration);
getReplicationContext().publishEvent(new DomainConfigReplicatedEvent(this));
@@ -166,4 +167,8 @@ public abstract class DomainManagerImpl extends SipxHibernateDaoSupport<Domain>
public void setInitialAlias(String initialAlias) {
m_initialAlias = initialAlias;
}
+
+ public void setConfigServerHost(String configServerHost) {
+ m_configServerHost = configServerHost;
+ }
}
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java
index 5e07e96..a411ee5 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java
@@ -1,10 +1,10 @@
/*
- *
- *
- * Copyright (C) 2007 Pingtel Corp., certain elements licensed under a Contributor Agreement.
+ *
+ *
+ * Copyright (C) 2007 Pingtel Corp., certain elements licensed under a Contributor Agreement.
* Contributors retain copyright to elements licensed under a Contributor Agreement.
* Licensed to the User under the LGPL license.
- *
+ *
* $
*/
package org.sipfoundry.sipxconfig.domain;
@@ -28,6 +28,7 @@ public class DomainConfigurationTest extends TestCase {
private DomainConfiguration m_out;
private String m_referenceConfig;
+ @Override
public void setUp() throws Exception {
m_domain = new Domain();
m_domain.setName("domain.example.com");
@@ -47,7 +48,7 @@ public class DomainConfigurationTest extends TestCase {
public void testWrite() throws Exception {
StringWriter actualConfigWriter = new StringWriter();
- m_out.generate(m_domain, m_realm, m_language, m_alarmServerUrl);
+ m_out.generate(m_domain, m_realm, "master.example.com", m_language, m_alarmServerUrl);
m_out.write(actualConfigWriter, null);
Reader actualConfigReader = new StringReader(actualConfigWriter.toString());
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config
index d8b3635..9c95b46 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config
@@ -3,3 +3,5 @@ SIP_REALM : realm.example.com
SHARED_SECRET : mySecret
DEFAULT_LANGUAGE : en
ALARM_SERVER_URL : https://domain.example.com:8092
+SUPERVISOR_PORT : 8092
+CONFIG_HOST : master.example.com
--
1.5.4.3
_______________________________________________
sipx-dev mailing list
[email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev
Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
