moksha/lib moksha/middleware
by John (J5) Palmieri
moksha/lib/helpers.py | 4 +++-
moksha/middleware/middleware.py | 9 +++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 37d7a987c1a057bce4ef5d23026039f0eb85d00a
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 18:04:05 2009 -0400
fix getting config files to work without a moksha config being present
diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py
index 1055739..09923be 100644
--- a/moksha/lib/helpers.py
+++ b/moksha/lib/helpers.py
@@ -784,7 +784,9 @@ def get_moksha_config_path():
if os.path.isfile(cfg):
return cfg
- log.warn('No moksha configuratin file found, make sure the controlling app is fully configured')
+ log.warn('No moksha configuration file found, make sure the controlling app is fully configured')
+
+ return None
# raise MokshaConfigNotFound('Cannot find moksha configuration file!')
diff --git a/moksha/middleware/middleware.py b/moksha/middleware/middleware.py
index d11b23a..03a1d1c 100644
--- a/moksha/middleware/middleware.py
+++ b/moksha/middleware/middleware.py
@@ -280,11 +280,16 @@ class MokshaMiddleware(object):
where it is being run as WSGI middleware in a different environment.
"""
- moksha_config_path = os.path.dirname(get_moksha_config_path())
+ moksha_config_path = get_moksha_config_path()
+ apps = []
+ if moksha_config_path:
+ moksha_config_path = os.path.dirname(moksha_config_path)
+ apps = [{'path': moksha_config_path}]
main_app_config_path = os.path.dirname(get_main_app_config_path())
loaded_configs = []
- for app in [{'path': moksha_config_path}] + moksha.apps.values():
+ apps += moksha.apps.values()
+ for app in apps:
for configfile in ('production.ini', 'development.ini'):
confpath = os.path.join(app['path'], configfile)
if os.path.exists(confpath):
15 years
moksha/lib
by John (J5) Palmieri
moksha/lib/helpers.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 898187b8d446d9674ce65a64c1332edd575d3b35
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 17:53:20 2009 -0400
don't error out if we can't find moksha's config
diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py
index 19e7587..1055739 100644
--- a/moksha/lib/helpers.py
+++ b/moksha/lib/helpers.py
@@ -784,7 +784,8 @@ def get_moksha_config_path():
if os.path.isfile(cfg):
return cfg
- raise MokshaConfigNotFound('Cannot find moksha configuration file!')
+ log.warn('No moksha configuratin file found, make sure the controlling app is fully configured')
+ # raise MokshaConfigNotFound('Cannot find moksha configuration file!')
def to_unicode(obj, encoding='utf-8'):
15 years
moksha/controllers
by John (J5) Palmieri
moksha/controllers/root.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 106dab26467de23320a9b2d2ecab9fb670ac7989
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 17:38:41 2009 -0400
comment out the widget browser for now
diff --git a/moksha/controllers/root.py b/moksha/controllers/root.py
index 0ce2153..57857a4 100644
--- a/moksha/controllers/root.py
+++ b/moksha/controllers/root.py
@@ -27,7 +27,7 @@ from tg.decorators import after_render
from repoze.what import predicates
from pkg_resources import resource_filename
-from widgetbrowser import WidgetBrowser
+#from widgetbrowser import WidgetBrowser
from pylons.i18n import ugettext as _, lazy_ugettext as l_
from moksha import _
@@ -51,6 +51,7 @@ class RootController(BaseController):
moksha_admin = SecureController()
# ToscaWidgets WidgetBrowser integration
+ """
docs = WSGIAppController(
WidgetBrowser(
template_dirs=[
@@ -58,6 +59,7 @@ class RootController(BaseController):
docs_dir=config.get('docs_dir', 'docs'),
full_stack=False,
interactive=False))
+ """
#@after_render(cache_rendered_data)
@expose('mako:moksha.templates.index')
15 years
normal-reqs.txt production/stable-reqs.txt
by John (J5) Palmieri
normal-reqs.txt | 1 -
production/stable-reqs.txt | 1 -
2 files changed, 2 deletions(-)
New commits:
commit be71dc86d8665104adaf76b21cba1d722dbcaac9
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 16:39:36 2009 -0400
remove the uuid req as it is built into python
diff --git a/normal-reqs.txt b/normal-reqs.txt
index 1d740e5..cbe244c 100644
--- a/normal-reqs.txt
+++ b/normal-reqs.txt
@@ -65,6 +65,5 @@ tg.devtools
transaction
tw.forms
tw.jquery
-uuid
zope.interface
zope.sqlalchemy
diff --git a/production/stable-reqs.txt b/production/stable-reqs.txt
index cc6a39f..f6433d1 100644
--- a/production/stable-reqs.txt
+++ b/production/stable-reqs.txt
@@ -69,7 +69,6 @@ tg.devtools==2.0b7
transaction==1.0a1
tw.forms==0.9.2
tw.jquery==0.9.4.2
-uuid==1.30
zope.interface==3.5.1
zope.sqlalchemy==0.4
## The following requirements were added by pip --freeze:
15 years
moksha.spec
by John (J5) Palmieri
moksha.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0b63d4495e8236f32ec5ee204e8c5ced479b3e42
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 16:10:09 2009 -0400
s/doc/docs
diff --git a/moksha.spec b/moksha.spec
index 52ebe56..380b614 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -97,7 +97,7 @@ make -C docs html
%files doc
%defattr(-,root,root)
-%doc doc/_build/html
+%doc docs/_build/html
%changelog
* Wed May 27 2009 John (J5) Palmieri <johnp(a)redhat.com> - 0.1-0.1
15 years
moksha.spec
by John (J5) Palmieri
moksha.spec | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
New commits:
commit fa92d7be6ff494250fd9b1ce5044486380b6df7e
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 16:08:03 2009 -0400
add a doc subpackge and build the docs
diff --git a/moksha.spec b/moksha.spec
index 25fd50b..52ebe56 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -17,6 +17,8 @@ BuildRequires: python-setuptools
BuildRequires: python-setuptools-devel
BuildRequires: python-devel
BuildRequires: python-pygments
+BuildRequires: python-paver
+BuildRequires: python-sphinx
Requires: TurboGears2
Requires: python-toscawidgets >= 0.9.1
@@ -46,11 +48,21 @@ external services. It is a unified framework build using the best available
open source technologies such as TurboGears2, jQuery, AMQP, and Orbited. More
information can be found on the Moksha Project Page at
+%package doc
+Summary: Developer documentation for Moksha
+Group: Documentation
+Requires: %name = %{version}-%{release}
+
+%description doc
+This package contains developer documentation for Moksha along with
+other supporting documentation
+
%prep
%setup -q
%build
%{__python} setup.py build
+make -C docs html
%install
%{__rm} -rf %{buildroot}
@@ -83,6 +95,10 @@ information can be found on the Moksha Project Page at
%attr(-,apache,apache) %dir %{_localstatedir}/cache/%{name}
%{_bindir}/moksha-hub
+%files doc
+%defattr(-,root,root)
+%doc doc/_build/html
+
%changelog
* Wed May 27 2009 John (J5) Palmieri <johnp(a)redhat.com> - 0.1-0.1
- first package
15 years
moksha.spec
by John (J5) Palmieri
moksha.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 0335c1ca9c240c1aa3da809d04c9022183bac1fc
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 15:56:14 2009 -0400
install each of the production dirs seperatly
diff --git a/moksha.spec b/moksha.spec
index 3421a5c..25fd50b 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -57,11 +57,17 @@ information can be found on the Moksha Project Page at
%{__python} setup.py install -O1 --skip-build \
--install-data=%{_datadir} --root %{buildroot}
-%{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production
+%{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production/apache
+%{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production/nginx
+%{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production/rabbitmq
+
%{__mkdir_p} -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}
%{__mkdir_p} -m 0700 %{buildroot}/%{_localstatedir}/cache/%{name}
-%{__install} -r production/* %{buildroot}%{_datadir}/%{name}/production/
+%{__install} production/*.* %{buildroot}%{_datadir}/%{name}/production/
+%{__install} production/apache/* %{buildroot}%{_datadir}/%{name}/production/apache
+%{__install} production/nginx/* %{buildroot}%{_datadir}/%{name}/production/nginx
+%{__install} production/rabbitmq/* %{buildroot}%{_datadir}/%{name}/production/rabbitmq
%clean
%{__rm} -rf %{buildroot}
15 years
moksha.spec
by John (J5) Palmieri
moksha.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5fa26ddc3bb81b04ed054cf649e9b04b97298735
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 15:47:52 2009 -0400
recursively install the files in production dir
diff --git a/moksha.spec b/moksha.spec
index d74c47b..3421a5c 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -57,10 +57,11 @@ information can be found on the Moksha Project Page at
%{__python} setup.py install -O1 --skip-build \
--install-data=%{_datadir} --root %{buildroot}
+%{__mkdir_p} %{buildroot}%{_datadir}/%{name}/production
%{__mkdir_p} -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}
%{__mkdir_p} -m 0700 %{buildroot}/%{_localstatedir}/cache/%{name}
-%{__install} production/ %{buildroot}%{_datadir}/%{name}/production
+%{__install} -r production/* %{buildroot}%{_datadir}/%{name}/production/
%clean
%{__rm} -rf %{buildroot}
15 years
moksha.spec
by John (J5) Palmieri
moksha.spec | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 9e585073759a19bcbaa4fed2e875a9bb7e0e0cd3
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 15:46:19 2009 -0400
fixes to the initial spec file
diff --git a/moksha.spec b/moksha.spec
index 9207bc6..d74c47b 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -57,14 +57,10 @@ information can be found on the Moksha Project Page at
%{__python} setup.py install -O1 --skip-build \
--install-data=%{_datadir} --root %{buildroot}
-%{__mkdir_p} %{buildroot}%{_datadir}/%{name}/apache
%{__mkdir_p} -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}
%{__mkdir_p} -m 0700 %{buildroot}/%{_localstatedir}/cache/%{name}
-%{__install} -m 640 apache/%{name}.conf %{buildroot}%{_datadir}/%{name}/apache
-
-%{__install} apache/%{name}.wsgi %{buildroot}%{_datadir}/%{name}/%{name}.wsgi
-%{__install} sample-production.ini %{buildroot}%{_datadir}/%{name}/production.ini
+%{__install} production/ %{buildroot}%{_datadir}/%{name}/production
%clean
%{__rm} -rf %{buildroot}
@@ -72,7 +68,7 @@ information can be found on the Moksha Project Page at
%files
%defattr(-,root,root,-)
-%doc README
+%doc README AUTHORS LICENSE COPYING
%{python_sitelib}/%{name}/
%attr(-,apache,root) %{_datadir}/%{name}
%attr(-,apache,root) %{_localstatedir}/log/%{name}
15 years
MANIFEST.in
by John (J5) Palmieri
MANIFEST.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 46fd8954bbb851c136578c61a63bded309f0eb35
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Jun 2 15:40:36 2009 -0400
fix the directory includes in the manifest
diff --git a/MANIFEST.in b/MANIFEST.in
index 36eabf6..b3f28b2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
-include docs/
-include production/
+recursive-include docs *
+recursive-include production *
include moksha.spec
include stop-moksha
include start-moksha
15 years