[kune-commits] r1733 - in trunk: . docs src/main/resources src/main/webapp
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Mon Mar 5 18:11:45 CET 2012
Author: vjrj_
Date: 2012-03-05 18:11:43 +0100 (Mon, 05 Mar 2012)
New Revision: 1733
Added:
trunk/CHANGING_DOMAIN_DOES_NOT_WORK
Removed:
trunk/CHANGING_DOMAIN
Modified:
trunk/docs/fst-2012.svg
trunk/docs/mlab-2012.svg
trunk/src/main/resources/kune.properties
trunk/src/main/resources/wave-server-production.properties
trunk/src/main/resources/wave-server.properties
trunk/src/main/webapp/ws.html
Log:
Comming back to localhost
Deleted: trunk/CHANGING_DOMAIN
===================================================================
--- trunk/CHANGING_DOMAIN 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/CHANGING_DOMAIN 2012-03-05 17:11:43 UTC (rev 1733)
@@ -1,42 +0,0 @@
-=CHANGING THE DOMAIN OF A KUNE SERVER=
-
-Suppose that we want to change from domain.old to domain.new in a kune server deployment.
-
-==Prerrequisites==
-
-* Make a backup of /var/lib/kune/, your db and any other location for wave info (_accounts, _deltas, etc)
-* Be sure that domain.new can be resolved correctly ($ dig domain.new), also the SRV records (see INSTALL)
-* stop kune
-
-==Do the job==
-
-===Update configurations and stores===
-* in _accounts, _deltas
-
-for i in `grep -ril domain.old /var/lib/kune/_accounts`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done
-for i in `grep -ril domain.old /var/lib/kune/_deltas`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done
-
-perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/kune.properties # or in /etc/kune
-perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/wave-server.properties # or in /etc/kune
-perl -p -i -e 's/domain.old/domain.new/g' src/main/webapp/ws.html
-or in production
-perl -p -i -e 's/domain.old/domain.new/g' /var/www/kune/ws.html
-
-rename 's/domain.old/domain.new/g' /var/lib/kune/_accounts
-
-Remove old persisted sessions:
-rm /var/lib/kune/_sessions/*
-
-===Update the openfire configuration===
-Update your new domain in:
-Server > Server Manager > Edit Server Properties
-Restart the openfire server
- /etc/init.d/openfire restart
-
-===Update your SMTP configuration (and MX record) ===
-So emails like someone at domain.new are propertly sended.
-
-===Certificates===
-Update your ssl certificates (openfire, wave keystore, wave federation, etc), if you have configured before with domain.old
-
-Restart kune and check if all it's ok.
Added: trunk/CHANGING_DOMAIN_DOES_NOT_WORK
===================================================================
--- trunk/CHANGING_DOMAIN_DOES_NOT_WORK (rev 0)
+++ trunk/CHANGING_DOMAIN_DOES_NOT_WORK 2012-03-05 17:11:43 UTC (rev 1733)
@@ -0,0 +1,42 @@
+=CHANGING THE DOMAIN OF A KUNE SERVER=
+
+Suppose that we want to change from domain.old to domain.new in a kune server deployment.
+
+==Prerrequisites==
+
+* Make a backup of /var/lib/kune/, your db and any other location for wave info (_accounts, _deltas, etc)
+* Be sure that domain.new can be resolved correctly ($ dig domain.new), also the SRV records (see INSTALL)
+* stop kune
+
+==Do the job==
+
+===Update configurations and stores===
+* in _accounts, _deltas
+
+for i in `grep -ril domain.old /var/lib/kune/_accounts`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done
+for i in `grep -ril domain.old /var/lib/kune/_deltas`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done
+
+perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/kune.properties # or in /etc/kune
+perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/wave-server.properties # or in /etc/kune
+perl -p -i -e 's/domain.old/domain.new/g' src/main/webapp/ws.html
+or in production
+perl -p -i -e 's/domain.old/domain.new/g' /var/www/kune/ws.html
+
+rename 's/domain.old/domain.new/g' /var/lib/kune/_accounts/*
+
+Remove old persisted sessions:
+rm /var/lib/kune/_sessions/*
+
+===Update the openfire configuration===
+Update your new domain in:
+Server > Server Manager > Edit Server Properties
+Restart the openfire server
+ /etc/init.d/openfire restart
+
+===Update your SMTP configuration (and MX record) ===
+So emails like someone at domain.new are propertly sended.
+
+===Certificates===
+Update your ssl certificates (openfire, wave keystore, wave federation, etc), if you have configured before with domain.old
+
+Restart kune and check if all it's ok.
Modified: trunk/docs/fst-2012.svg
===================================================================
--- trunk/docs/fst-2012.svg 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/docs/fst-2012.svg 2012-03-05 17:11:43 UTC (rev 1733)
@@ -37,6 +37,10 @@
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
showborder="true" />
+ <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' />
+ <style>
+ text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; }
+ </style>
<defs
id="defs4"><linearGradient
x1="203.47221"
Modified: trunk/docs/mlab-2012.svg
===================================================================
--- trunk/docs/mlab-2012.svg 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/docs/mlab-2012.svg 2012-03-05 17:11:43 UTC (rev 1733)
@@ -37,6 +37,10 @@
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
showborder="true" />
+ <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' />
+ <style>
+ text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; }
+ </style>
<defs
id="defs4"><linearGradient
x1="203.47221"
Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/src/main/resources/kune.properties 2012-03-05 17:11:43 UTC (rev 1733)
@@ -3,7 +3,7 @@
### general site config
# Your site url. Please end with a slash
-kune.siteurl = http://local.net:8080/
+kune.siteurl = http://localhost:8080/
kune.sitelogourl = ws/images/kune-logo-16px.png
kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png
@@ -23,8 +23,8 @@
### Email
-kune.site.smtp.host = local.net
-kune.site.smtp.defaultfrom = noreply at local.net
+kune.site.smtp.host = localhost
+kune.site.smtp.defaultfrom = noreply at localhost
# If we should avoid the use of smtp (use only for avoid emails during development)
kune.site.smtp.skip = false
# This file will we the html used to send emails to users.
@@ -57,12 +57,12 @@
kune.admin.name = Site Administrator
kune.admin.shortName = admin
-kune.admin.email = admin at local.net.localdomain
+kune.admin.email = admin at localhost.localdomain
kune.admin.password = easyeasy
kune.chat.httpbase = /http-bind/
-kune.chat.domain = local.net
-kune.chat.roomHost = rooms.local.net
+kune.chat.domain = localhost
+kune.chat.roomHost = rooms.localhost
### Feedback system
kune.feedback.enabled = true
@@ -100,7 +100,7 @@
kune.client.useContentCache = false
-kune.publispace.toolicon.visible = false
+kune.publispace.toolicon.visible = true
# SVG Tutorials
# The languages in with the /tutorials/ are translated into
Modified: trunk/src/main/resources/wave-server-production.properties
===================================================================
--- trunk/src/main/resources/wave-server-production.properties 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/src/main/resources/wave-server-production.properties 2012-03-05 17:11:43 UTC (rev 1733)
@@ -68,7 +68,7 @@
# To become an admin: Register a user and set its address as the value below.
# Admin has a privilege to change passwords of other users using an agent robot.
# Default value: @${wave_server_domain}
-admin_user = @local.net
+admin_user = @localhost
# The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA).
# If filled in then a copy of this wave (actually only the root blip) will be
Modified: trunk/src/main/resources/wave-server.properties
===================================================================
--- trunk/src/main/resources/wave-server.properties 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/src/main/resources/wave-server.properties 2012-03-05 17:11:43 UTC (rev 1733)
@@ -3,12 +3,12 @@
# Domain name of the wave server
# Default value: local.net (without .domain zone some things will be broken)
-wave_server_domain = local.net
+wave_server_domain = localhost
# A comma separated list of address on which to listen for connections.
# Each address is a comma separated host:port pair.
-# Default value: local.net:9898
-http_frontend_public_address = local.net:8888
+# Default value: localhost:9898
+http_frontend_public_address = localhost:8888
# Default value: values passed to http_frontend_public_address.
http_frontend_addresses = ${http_frontend_public_address}
@@ -68,7 +68,7 @@
# To become an admin: Register a user and set its address as the value below.
# Admin has a privilege to change passwords of other users using an agent robot.
# Default value: @${wave_server_domain}
-admin_user = @local.net
+admin_user = @localhost
# The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA).
# If filled in then a copy of this wave (actually only the root blip) will be
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2012-03-05 04:12:44 UTC (rev 1732)
+++ trunk/src/main/webapp/ws.html 2012-03-05 17:11:43 UTC (rev 1733)
@@ -14,10 +14,10 @@
-->
<meta name="kune.default.site.commonname" content="this site" />
<meta name="emite.httpBase" content="/http-bind/" />
-<meta name="emite.host" content="local.net" />
-<meta name="emite.searchHost" content="search.local.net" />
+<meta name="emite.host" content="localhost" />
+<meta name="emite.searchHost" content="search.localhost" />
<!--<meta name="emite.session" content="login" />-->
-<meta name="hablar.roomService" content="rooms.local.net" />
+<meta name="hablar.roomService" content="rooms.localhost" />
<meta name="hablar.login" content="false" />
<meta name="hablar.hasVCard" content="false" />
<meta name="hablar.search" content="false" />
More information about the kune-commits
mailing list