|
Line
Link Here
|
|
|
|
++ config.py 2009-05-10 02:35:50.000000000 -0400 |
|
Lines 1295-1302
Link Here
|
| 1295 |
|
1295 |
|
| 1296 |
allowed_servers = {'apache' : WebappConfig.server.Apache, |
1296 |
allowed_servers = {'apache' : WebappConfig.server.Apache, |
| 1297 |
'lighttpd' : WebappConfig.server.Lighttpd, |
1297 |
'lighttpd' : WebappConfig.server.Lighttpd, |
| 1298 |
'aolserver': WebappConfig.server.Aolserver, |
1298 |
'cherokee' : WebappConfig.server.Cherokee, |
| 1299 |
'cherokee' : WebappConfig.server.Cherokee} |
1299 |
'nginx' : WebappConfig.server.Nginx, |
|
|
1300 |
'gatling' : WebappConfig.server.Gatling} |
| 1300 |
|
1301 |
|
| 1301 |
server = self.config.get('USER', 'vhost_server') |
1302 |
server = self.config.get('USER', 'vhost_server') |
| 1302 |
|
1303 |
|
| 1303 |
-- WebappConfig/server.py 2009-05-10 02:35:17.000000000 -0400 |
1304 |
++ server.py 2009-05-10 02:36:05.000000000 -0400 |
|
Lines 316-331
Link Here
|
| 316 |
self.vhost_server_uid = get_user('lighttpd') |
316 |
self.vhost_server_uid = get_user('lighttpd') |
| 317 |
self.vhost_server_gid = get_group('lighttpd') |
317 |
self.vhost_server_gid = get_group('lighttpd') |
| 318 |
|
318 |
|
| 319 |
class Aolserver(Basic): |
|
|
| 320 |
|
| 321 |
name = 'Aolserver' |
| 322 |
desc = 'supports installation on Aolserver' |
| 323 |
dep = 'www-servers/aolserver' |
| 324 |
|
| 325 |
def set_server_user(self): |
| 326 |
self.vhost_server_uid = get_user('aolserver') |
| 327 |
self.vhost_server_gid = get_group('aolserver') |
| 328 |
|
| 329 |
class Cherokee(Basic): |
319 |
class Cherokee(Basic): |
| 330 |
|
320 |
|
| 331 |
name = 'Cherokee' |
321 |
name = 'Cherokee' |
|
Lines 336-344
Link Here
|
| 336 |
self.vhost_server_uid = get_user('cherokee') |
326 |
self.vhost_server_uid = get_user('cherokee') |
| 337 |
self.vhost_server_gid = get_group('cherokee') |
327 |
self.vhost_server_gid = get_group('cherokee') |
| 338 |
|
328 |
|
|
|
329 |
class Nginx(Basic): |
| 330 |
|
| 331 |
name = 'Nginx' |
| 332 |
desc = 'supports installation on Nginx' |
| 333 |
dep = 'www-servers/nginx' |
| 334 |
|
| 335 |
def set_server_user(self): |
| 336 |
self.vhost_server_uid = get_user('nginx') |
| 337 |
self.vhost_server_gid = get_group('nginx') |
| 338 |
|
| 339 |
class Gatling(Basic): |
| 340 |
|
| 341 |
name = 'Gatling' |
| 342 |
desc = 'supports installation on Gatling' |
| 343 |
dep = 'www-servers/gatling' |
| 344 |
|
| 345 |
def set_server_user(self): |
| 346 |
self.vhost_server_uid = get_user('gatling') |
| 347 |
self.vhost_server_gid = get_group('gatling') |
| 348 |
|
| 339 |
def listservers(): |
349 |
def listservers(): |
| 340 |
OUT.notice('\n'.join(['apache', |
350 |
OUT.notice('\n'.join(['apache', |
| 341 |
'aolserver', |
|
|
| 342 |
'lighttpd', |
351 |
'lighttpd', |
| 343 |
'cherokee'])) |
352 |
'cherokee', |
|
|
353 |
'nginx', |
| 354 |
'gatling'])) |
| 344 |
-- config/webapp-config 2009-05-10 02:35:17.000000000 -0400 |
355 |
++ webapp-config 2009-05-10 02:36:20.000000000 -0400 |
|
Lines 65-73
Link Here
|
| 65 |
# your choices are: |
65 |
# your choices are: |
| 66 |
# |
66 |
# |
| 67 |
# apache |
67 |
# apache |
| 68 |
# aolserver |
|
|
| 69 |
# lighttpd |
68 |
# lighttpd |
| 70 |
# cherokee |
69 |
# cherokee |
|
|
70 |
# nginx |
| 71 |
# gatling |
| 71 |
# |
72 |
# |
| 72 |
# you can override this setting by using the -s switch to webapp-config |
73 |
# you can override this setting by using the -s switch to webapp-config |
