1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
diff --git a/config.example.js b/config.example.js
index f432409..1049700 100644
--- a/config.example.js
+++ b/config.example.js
@@ -6,7 +6,7 @@ conf.group = "";
// Log file location
-conf.log = "kiwi.log";
+conf.log = "/var/log/kiwi/kiwiirc.log";
@@ -53,7 +53,7 @@ conf.identd = {
// Where the client files are
-conf.public_http = "client/";
+conf.public_http = "/var/lib/kiwiirc/";
// Transports available to the client.
// Behind an Apache reverse proxy? Uncomment the below - Apache does not support websockets!
@@ -122,7 +122,7 @@ conf.client_plugins = [
// Directory to find the server modules
-conf.module_dir = "../server_modules/";
+conf.module_dir = "/usr/lib/kiwiirc/server_modules/";
// Which modules to load
conf.modules = [
diff --git a/kiwi b/kiwi
index ddcdfdf..dca2dcc 100755
--- a/kiwi
+++ b/kiwi
@@ -1,11 +1,6 @@
#!/bin/sh
-basedir=`dirname "$0"`
-case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-$(command -v nodejs || command -v node) $basedir/server/helpers/launcher.js "$@"
+node /usr/share/webapps/kiwiirc/server/helpers/launcher.js "$@"
ret=$?
exit $ret
diff --git a/server_modules/client_file_watcher.js b/server_modules/client_file_watcher.js
index 2c3a017..47ad093 100644
--- a/server_modules/client_file_watcher.js
+++ b/server_modules/client_file_watcher.js
@@ -6,12 +6,12 @@
var fs = require('fs');
var path = require('path');
-var kiwiModules = require('../server/modules');
+var kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules');
var module = new kiwiModules.Module('client_file_watcher');
// Watch the common stylesheets
-fs.watch('client/assets/css', alertClients);
+fs.watch('/var/lib/kiwiirc/assets/css', alertClients);
// Watch the theme stylesheets
diff --git a/server_modules/control.js b/server_modules/control.js
index d1c9cbf..1e187ec 100644
--- a/server_modules/control.js
+++ b/server_modules/control.js
@@ -5,8 +5,8 @@
*/
var net = require('net'),
- kiwiModules = require('../server/modules'),
- ControlInterface = require('../server/controlinterface.js'),
+ kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules'),
+ ControlInterface = require('/usr/share/webapps/kiwiirc/server/controlinterface.js'),
_ = require('lodash'),
winston = require('winston');
diff --git a/server_modules/dnsbl.js b/server_modules/dnsbl.js
index 1a2c718..54a4300 100644
--- a/server_modules/dnsbl.js
+++ b/server_modules/dnsbl.js
@@ -5,7 +5,7 @@
*/
var dns = require('dns'),
- kiwiModules = require('../server/modules');
+ kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules');
// The available DNS zones to check against
diff --git a/server_modules/example.js b/server_modules/example.js
index d880c19..575dc5f 100644
--- a/server_modules/example.js
+++ b/server_modules/example.js
@@ -1,4 +1,4 @@
-var kiwiModules = require('../server/modules');
+var kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules');
var module = new kiwiModules.Module('Example Module');
diff --git a/server_modules/force_https.js b/server_modules/force_https.js
index 9ca8362..512ffed 100644
--- a/server_modules/force_https.js
+++ b/server_modules/force_https.js
@@ -4,7 +4,7 @@
* Keep users secure by redirecting them to HTTPS if not already
*/
-var kiwiModules = require('../server/modules');
+var kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules');
var module = new kiwiModules.Module('force_https');
diff --git a/server_modules/proxychecker.js b/server_modules/proxychecker.js
index 660defc..7fb96e6 100644
--- a/server_modules/proxychecker.js
+++ b/server_modules/proxychecker.js
@@ -5,7 +5,7 @@
*/
var util = require('util'),
- kiwiModules = require('../server/modules');
+ kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules');
var module = new kiwiModules.Module('proxychecker');
diff --git a/server_modules/stats.js b/server_modules/stats.js
index 736ba17..a9de440 100644
--- a/server_modules/stats.js
+++ b/server_modules/stats.js
@@ -4,7 +4,7 @@
* Retreive stats for internal kiwi events. Handy for graphing
*/
-var kiwiModules = require('../server/modules'),
+var kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules'),
fs = require('fs');
diff --git a/server_modules/web_agent_debugger.js b/server_modules/web_agent_debugger.js
index 2358508..ef85e9f 100644
--- a/server_modules/web_agent_debugger.js
+++ b/server_modules/web_agent_debugger.js
@@ -6,7 +6,7 @@
*/
-var kiwiModules = require('../server/modules'),
+var kiwiModules = require('/usr/share/webapps/kiwiirc/server/modules'),
agent = require('webkit-devtools-agent');
|
