Difference between revisions of "Etherpad"
From Fixme.ch
(→IPv6 and SSL) |
|||
| Line 55: | Line 55: | ||
== IPv6 and SSL == | == IPv6 and SSL == | ||
| − | |||
| − | |||
| − | |||
| − | |||
* Here is a reverse proxy configuration for apache. It then supports IPv6 and SSL | * Here is a reverse proxy configuration for apache. It then supports IPv6 and SSL | ||
<syntaxhighlight lang="apache"> | <syntaxhighlight lang="apache"> | ||
| Line 83: | Line 79: | ||
</VirtualHost> | </VirtualHost> | ||
</syntaxhighlight> | </syntaxhighlight> | ||
| − | * Here is | + | * SSL was not working, patched /home/etherpadlite/etherpad-lite/node/server.js (This is now replaced by the reverse proxy) |
| + | ** Here is the ugly patch | ||
<syntaxhighlight lang="diff"> | <syntaxhighlight lang="diff"> | ||
diff --git a/node/server.js b/node/server.js | diff --git a/node/server.js b/node/server.js | ||
Revision as of 16:14, 14 March 2012
- Installed on Internal_Server
- Etherpad lite installed by hand in /home/etherpadlite and run by /etc/init.d/etherpad-lite
- http://foo.fixme.ch:9001/
- https://foo.fixme.ch (must be moved to pad.fixme.ch)
Contents
Cosmetic
- Modification of the file /home/etherpadlite/etherpad-lite/static/js/pad.js 96-102 so it's Monospace font by default (didn't find a better working way), editing static/custom/pad.js with pad.changeViewOption('useMonospaceFont', true); doesn't work.
diff --git a/static/js/pad.js b/static/js/pad.js index bda6895..4d2e4e9 100644 --- a/static/js/pad.js +++ b/static/js/pad.js @@ -93,13 +93,13 @@ function getParams() settings.LineNumbersDisabled = true; } } - if(useMonospaceFont) - { - if(useMonospaceFont == "true") - { + //if(useMonospaceFont) + //{ + // if(useMonospaceFont == "true") + // { settings.useMonospaceFontGlobal = true; - } - } + // } + //} if(userName) { // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad. diff --git a/static/pad.html b/static/pad.html index 4c6d4d8..1318257 100644 --- a/static/pad.html +++ b/static/pad.html @@ -1,7 +1,7 @@ <!doctype html> <html> - <title>Etherpad Lite</title> + <title>FIXME Etherpad Lite</title> <meta charset="utf-8"> <meta name="robots" content="noindex, nofollow"> @@ -276,4 +276,4 @@ }()); </script> -</html> \ No newline at end of file +</html>
IPv6 and SSL
- Here is a reverse proxy configuration for apache. It then supports IPv6 and SSL
NameVirtualHost *:9000 Listen 9000 <VirtualHost *:9000> ServerName foo.fixme.ch ServerSignature Off CustomLog /var/log/apache2/etherpad_access.log combined ErrorLog /var/log/apache2/etherpad_error.log # Reverse Proxy for Etherpad ProxyVia On ProxyRequests Off ProxyPass / http://127.0.0.1:9001/ ProxyPassReverse / http://127.0.0.1:9001/ ProxyPreserveHost on <Proxy *> Options FollowSymLinks MultiViews AllowOverride All Order allow,deny allow from all </Proxy> </VirtualHost>
- SSL was not working, patched /home/etherpadlite/etherpad-lite/node/server.js (This is now replaced by the reverse proxy)
- Here is the ugly patch
diff --git a/node/server.js b/node/server.js index c5377d8..2416a71 100644 --- a/node/server.js +++ b/node/server.js @@ -68,7 +68,10 @@ exports.maxAge = settings.maxAge; //set loglevel log4js.setGlobalLogLevel(settings.loglevel); -async.waterfall([ +async.waterfall(startServer('0.0.0.0')); +async.waterfall(startServer('2001:788:dead:beef::5')); + +function startServer(ipAddr){ return [ //initalize the database function (callback) { @@ -78,7 +81,11 @@ async.waterfall([ function (callback) { //create server - var app = express.createServer(); + var options = { + key: fs.readFileSync('/home/etherpadlite/etherpad-lite/node_modules/socket.io/node_modules/policyfile/tests/ssl/ssl.private.key'), + cert: fs.readFileSync('/home/etherpadlite/etherpad-lite/node_modules/socket.io/node_modules/policyfile/tests/ssl/ssl.crt'), + } + var app = express.createServer(options); app.use(function (req, res, next) { res.header("Server", serverName); @@ -409,8 +416,8 @@ async.waterfall([ }); //let the server listen - app.listen(settings.port, settings.ip); - console.log("Server is listening at " + settings.ip + ":" + settings.port); + app.listen(settings.port, ipAddr); + console.log("Server is listening at " + ipAddr + ":" + settings.port); var onShutdown = false; var gracefulShutdown = function(err) @@ -497,4 +504,6 @@ async.waterfall([ callback(null); } -]); +]; +} +
