configuration for domain other than localhost
Leho Kraav
maybe a a few lines on the subj? getting past 'invalid superdomain' is
the problem.
Aaron Iba
Andrew Fong
I'd recommend just trying that first before editing pro_utils.js.
Making isProDomainRequest() return gave me errors about being unable
to find the id for a subdomain record.
-- Andrew
On Dec 18, 2:05 am, Aaron Iba <a...@aaroniba.net> wrote:
> I think you'll want to add the domain you would like to use to the list of
> "superdomains" in globals.js.
>
> http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et...
>
> I think it only works with two-part domains, of the form x.y, because it
> assumes that any request for x.y.z should be routed to the "professional
> domain" x. The logic around this behavior is contained in pro_utils.js:
>
> http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et...
>
> If you want to just allow all domains to serve the "regular" etherpad site,
> then you could probably change isProDomainRequest() to always return true.
> Note that there are two versions of this function, one in utils.js and one
> in pro_utils.js:
>
John McLear
That didn't fix the issue that I want to have pro domains so users can
password secure.
My domains etc. are working fine, site is at http://primarypad.com -
tried http://monkey.primarypad.com and got no where..
Anyone any idea?
Cheers
On Dec 18, 10:05 am, Aaron Iba <a...@aaroniba.net> wrote:
> I think you'll want to add the domain you would like to use to the list of
> "superdomains" in globals.js.
>
> http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et...
>
> I think it only works with two-part domains, of the form x.y, because it
> assumes that any request for x.y.z should be routed to the "professional
> domain" x. The logic around this behavior is contained in pro_utils.js:
>
> http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et...
>
> If you want to just allow all domains to serve the "regular" etherpad site,
> then you could probably change isProDomainRequest() to always return true.
> Note that there are two versions of this function, one in utils.js and one
> in pro_utils.js:
>
John McLear
On Dec 21, 8:54 pm, John McLear <johnym...@gmail.com> wrote:
> I had to edit src/main.js replacing etherpad.com with with domain.
> That didn't fix the issue that I want to have pro domains so users can
> password secure.
>
> My domains etc. are working fine, site is athttp://primarypad.com-
> triedhttp://monkey.primarypad.comand got no where..
>
> Anyone any idea?
>
> Cheers
>
> On Dec 18, 10:05 am, Aaron Iba <a...@aaroniba.net> wrote:
>
>
>
> > I think you'll want to add the domain you would like to use to the list of
> > "superdomains" in globals.js.
>
> >http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et...
>
> > I think it only works with two-part domains, of the form x.y, because it
> > assumes that any request for x.y.z should be routed to the "professional
> > domain" x. The logic around this behavior is contained in pro_utils.js:
>
> >http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et...
>
> > If you want to just allow all domains to serve the "regular" etherpad site,
> > then you could probably change isProDomainRequest() to always return true.
> > Note that there are two versions of this function, one in utils.js and one
> > in pro_utils.js:
>
> >http://code.google.com/p/etherpad/source/browse/trunk/etherpad/src/et......
Paul Archer
The function getRequestSuperdomain (in pro/pro_utils.js) only grabs
the top two levels of the domain:
function getRequestSuperdomain() {
var parts = request.domain.split('.');
parts.reverse();
if (parts[0] == ".") {
parts.shift();
}
return [parts[1], parts[0]].join('.'); // two levels only
}
So it will take a domain like test1.etherpad.example.com and strip it
down to just example.com, which it returns. Then the function
isProDomainRequest checks to see if that's a valid superdomain.
There's two ways to fix this:
1) Change the function:
function getRequestSuperdomain() {
var parts = request.domain.split('.');
if (parts[0] == ".") {
parts.shift();
}
parts.shift();
return parts.join('.');
}
1) Simply add the two-level domain to your list of superdomains in
globals.js:
var SUPERDOMAINS = {
'etherpad.example.com': true,
'example.com': true
};
Paul Archer
Paul Archer
> var parts = request.domain.split('.');
> if (parts[0] == ".") {
> parts.shift();
> }
> parts.shift();
> return parts.join('.');
>
> }
I found out this breaks a couple of things, so I changed it to >
function getRequestSuperdomain() {
var parts = request.domain.split('.');
if (parts[0] == ".") {
parts.shift();
}
if(parts[0] != 'etherpad'){
parts.shift();
}
return parts.join('.');
}
This assumes that the subdomain for your site is 'etherpad'. It's a
bit kludgy, but it helps.
mijo
I tested your solution and it breaks my installation :-( I changed
the function as follows:
function getRequestSuperdomain() {
var parts = request.domain.split('.');
parts.reverse();
if (parts[0] == ".") {
parts.shift();
}
return [parts[2],parts[1], parts[0]].join('.');
}
Not so elegant, but it works for me :-)
Regards
Michael
Paul Archer schrieb:
Paul Archer
> the function as follows:
>
> function getRequestSuperdomain() {
> var parts = request.domain.split('.');
> parts.reverse();
> if (parts[0] == ".") {
> parts.shift();
> }
> return [parts[2],parts[1], parts[0]].join('.');
>
I think this is the fundamental problem with this code, at least in
this respect: there's too much assumption about what the domain is
supposed to look like.
Out of curiousity, what is your domain name? I'm using
etherpad.example.com ('example' being a substitute for my work
domain).
Paul
mijo
and *.etherpad.netluchs.de for the pro-Domains.
Concerning the code I thing the same: there are many hidden
dependencies, assumptions and duplications. This seems to be caused by
the three different versions of etherpad mixed up in one project
(free, pro and pne). Out of experience I know, how such a mess starts
to grow - but until now I always managed to keep this code "in
house" :-)
After setting up a working version of etherpad, the next question I'm
interested in is, how are we (?) going to organize the further
development. We are getting many different forks by now. But this
should be an other topic for next year.
Michael
Paul Archer schrieb:
Marcel Waldvogel
actually identifies the entry in SUPERDOMAINS which is the suffix of
the specified virtual host, no need to search for keywords or use a
constant number of domain levels. There is some duplicated code now in
pro_utils.js, so it could be cleaned up more… (getRequestSuperdomainOLD
() is no longer in use, just for educational purposes)
-Marcel
Index: etherpad/src/etherpad/pro/pro_utils.js
===================================================================
--- etherpad/src/etherpad/pro/pro_utils.js (Revision 5)
+++ etherpad/src/etherpad/pro/pro_utils.js (Revision 6)
@@ -44,7 +44,7 @@
return d.split('.')[0];
}
-function getRequestSuperdomain() {
+function getRequestSuperdomainOLD() {
var parts = request.domain.split('.');
parts.reverse();
if (parts[0] == ".") {
@@ -53,6 +53,18 @@
return [parts[1], parts[0]].join('.');
}
+function getRequestSuperdomain() {
+ var parts = request.domain.split('.');
+ parts.pop(); // Remove one level
+ while (parts.length > 0) {
+ var domain = parts.join('.');
+ if (SUPERDOMAINS[domain]) {
+ return domain;
+ }
+ parts.pop(); // Remove next level
+ }
+}
+
function isProDomainRequest() {
// the result of this function never changes within the same
request.
var c = appjet.requestCache;