From 4fbc399d29eb1a887a7cad3a560498b3435b53a8 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 14 Mar 2013 18:19:57 +0100 Subject: [PATCH] ship apache stuff (config, wsgi, and favicon) on top --- apache/favicon.ico | Bin 0 -> 1150 bytes apache/myslice.conf | 20 ++++++++++++++++++++ apache/myslice.wsgi | 12 ++++++++++++ myslice.spec | 2 ++ setup.py | 2 ++ 5 files changed, 36 insertions(+) create mode 100644 apache/favicon.ico create mode 100644 apache/myslice.conf create mode 100644 apache/myslice.wsgi diff --git a/apache/favicon.ico b/apache/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3925be4f9ceb5e872ed489f7260c9714d979ee36 GIT binary patch literal 1150 zcmb8uT}V@57zgl2wvtV^<~~lk54X9RuCN_AX^A-n3(-nTtZ*aUl!?RIY%WQ%lJFuU zh`zllD69*EnM5JtXX347AW;NScXi=aS1JGAcj93eUFbW0d*Aas&;M{P&LPTRKb?-) zzk@oJL;?{NF|5QY8+Ep&mOhJ!OJ7Q*(#s?nY!RRJ@_S@vW_p=b2HV6lUbR}CWRS%? z@hk9{;n)9TGR?zenoI8`H5v`L;eY~jF~UL*;bQep)a+M5tJNSo+X}tD4F z*VsOt%J7^{r%M?=uf(s>W_-G3#^Pnd*L!XxI~A~*=b$$MCL@DCSi+l#3YOfX$kE49-~>dmU!LbVK@emO2X|q)n^5YrK=Ha6 z$8T5QOTPl|qdVC1_9D;+rywZPgU!s_>-Y4Q&$ z$AR4H4(#oC0QYlXPhe1<=UKPgonn1d5BZ~2p8-5Cfc&R` zopIlomvbJE2VBAZQ@HwL1o7|BP!v4|slGB*=e^o<0eIVn(6h9TzK?6zcWp}U6&DvL z8E{?WLuelxOr1At>3i3!1;k!Xr}vZM##&_?dpEX)XGH!DN|GcpV+^*4&!)1o3ZHr) vL!}~$CWyjuq9g3PPK1f#J|bT4V(0c4QK*~s4-iG7tRET32q$J07b5=vGySg| literal 0 HcmV?d00001 diff --git a/apache/myslice.conf b/apache/myslice.conf new file mode 100644 index 00000000..011502ce --- /dev/null +++ b/apache/myslice.conf @@ -0,0 +1,20 @@ +## https://docs.djangoproject.com/en/1.3/howto/deployment/modwsgi/ +# +#Alias /robots.txt /usr/share/myslice/all-static/robots.txt +Alias /favicon.ico /usr/share/myslice/all-static/favicon.ico + +#AliasMatch ^/([^/]*\.css) /usr/share/myslice/all-static/styles/$1 + +Alias /all-static/ /usr/share/myslice/all-static/ + + +Order deny,allow +Allow from all + + +WSGIScriptAlias / /usr/share/myslice/apache/myslice.wsgi + + +Order allow,deny +Allow from all + diff --git a/apache/myslice.wsgi b/apache/myslice.wsgi new file mode 100644 index 00000000..6e36476a --- /dev/null +++ b/apache/myslice.wsgi @@ -0,0 +1,12 @@ +import os +import sys + +path = '/usr/share/myslice' +if path not in sys.path: + sys.path.append(path) + +os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings' + +import django.core.handlers.wsgi +application = django.core.handlers.wsgi.WSGIHandler() + diff --git a/myslice.spec b/myslice.spec index aaa84c0d..2925b604 100644 --- a/myslice.spec +++ b/myslice.spec @@ -19,6 +19,8 @@ URL: %{SCMURL} # We use set everywhere Requires: python >= 2.7 Requires: Django +Requires: httpd +Requires: mod_wsgi BuildRequires: python-setuptools make %description diff --git a/setup.py b/setup.py index 2eeb598c..e767a3db 100644 --- a/setup.py +++ b/setup.py @@ -19,4 +19,6 @@ setup(packages = packages, ( 'all-static/css', glob ('all-static/css/*')), ( 'all-static/img', glob ('all-static/img/*')), ( 'all-templates', glob ('all-templates/*')), + ( 'all-static', ['apache/favicon.ico', ] ), + ( 'apache', [ 'apache/myslice.conf', 'apache/myslice.wsgi' ]), ]) -- 2.43.0