nginx enhanced webapp-config

This commit is contained in:
Micha Glave 2009-12-18 12:28:25 +01:00
parent fa6706b4db
commit 89a69d27dd
3 changed files with 83 additions and 1 deletions

View File

@ -2,7 +2,8 @@ AUX webapp-config-1.50.16-absolute-paths.patch 1707 RMD160 80f07c8b98c69e13d1c5f
AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93e2974357b4e9d6a SHA1 b963fb9cc2b6f10e6dbcf5a3db1178be20268fd6 SHA256 9a78c618d750c79a16d216e00f0b8a9c4058e7ba3d23011d999206e9de825790
AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b SHA1 1d69d0d88a750b05389b71771b371650eaa89913 SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360
AUX webapp-config-1.50.16-htdocs-symlink.patch 509 RMD160 ad53b2107e5f51626f3996925c9562d77fc1fdb5 SHA1 0adaefe78f272f32a939f56f941634c7f3c8ed6a SHA256 24e48a42f2b08010ad25f5f83bf4f3f47686fbcd786c0547e95c054cf7021b75
AUX webapp-config-1.50.16-nginx.patch 2565 RMD160 1547ba9dc6731eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7
DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
EBUILD webapp-config-1.50.16-r3.ebuild 1995 RMD160 82f031dd6dcbcf6353357f07a275f61ae7699bbf SHA1 a2a78ab9e1ad99f4a0895eb625e17a4b3f391ac1 SHA256 0fbf594b16dcb7a10fdc7c48d72453aaae3baa2a4d130a7392b9c3039e5299e3
EBUILD webapp-config-1.50.16-r3.ebuild 2034 RMD160 978a3a99de1d4ed8e827b1b4bda0b9403ccfce63 SHA1 f2b4e649e737feac2f88680651ac6b65b737996c SHA256 be3841e2fd925e03ef5f3a32b86d4776216dceebb7de2f660a99f00ab89e453b
MISC ChangeLog 22882 RMD160 e440af3b28dd85124e3c59e30dd3af516d956428 SHA1 296662a567a39daf40fec42d84e3f589df757ae0 SHA256 80626049dfff1a8970bf48971236db987ca2eab95215d07fdaeaafdf0799a793
MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96

View File

@ -0,0 +1,80 @@
--- WebappConfig/config.py 2006-12-30 13:38:36.000000000 -0500
+++ config.py 2009-05-28 12:08:53.000000000 -0400
@@ -1289,8 +1289,9 @@
allowed_servers = {'apache' : WebappConfig.server.Apache,
'lighttpd' : WebappConfig.server.Lighttpd,
- 'aolserver': WebappConfig.server.Aolserver,
- 'cherokee' : WebappConfig.server.Cherokee}
+ 'cherokee' : WebappConfig.server.Cherokee,
+ 'nginx' : WebappConfig.server.Nginx,
+ 'gatling' : WebappConfig.server.Gatling}
server = self.config.get('USER', 'vhost_server')
--- WebappConfig/server.py 2009-05-28 12:06:48.000000000 -0400
+++ server.py 2009-05-28 12:10:54.000000000 -0400
@@ -316,16 +316,6 @@
self.vhost_server_uid = get_user('lighttpd')
self.vhost_server_gid = get_group('lighttpd')
-class Aolserver(Basic):
-
- name = 'Aolserver'
- desc = 'supports installation on Aolserver'
- dep = 'www-servers/aolserver'
-
- def set_server_user(self):
- self.vhost_server_uid = get_user('aolserver')
- self.vhost_server_gid = get_group('aolserver')
-
class Cherokee(Basic):
name = 'Cherokee'
@@ -336,9 +326,30 @@
self.vhost_server_uid = get_user('cherokee')
self.vhost_server_gid = get_group('cherokee')
+class Nginx(Basic):
+
+ name = 'Nginx'
+ desc = 'supports installation on Nginx'
+ dep = 'www-servers/nginx'
+
+ def set_server_user(self):
+ self.vhost_server_uid = get_user('nginx')
+ self.vhost_server_gid = get_group('nginx')
+
+class Gatling(Basic):
+
+ name = 'Gatling'
+ desc = 'supports installation on Gatling'
+ dep = 'www-servers/gatling'
+
+ def set_server_user(self):
+ self.vhost_server_uid = get_user('gatling')
+ self.vhost_server_gid = get_group('gatling')
+
def listservers():
OUT.notice('\n'.join(['apache',
- 'aolserver',
'lighttpd',
- 'cherokee']))
+ 'cherokee',
+ 'nginx',
+ 'gatling']))
--- config/webapp-config 2006-12-30 13:39:13.000000000 -0500
+++ webapp-config 2009-05-28 12:11:24.000000000 -0400
@@ -65,9 +65,10 @@
# your choices are:
#
# apache
-# aolserver
# lighttpd
# cherokee
+# nginx
+# gatling
#
# you can override this setting by using the -s switch to webapp-config

View File

@ -22,6 +22,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-baselayout2.patch
epatch "${FILESDIR}"/${P}-htdocs-symlink.patch
epatch "${FILESDIR}"/${P}-absolute-paths.patch
epatch "${FILESDIR}"/${P}-nginx.patch
rm -f doc/webapp.eclass.5{,.html}
}