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 zcmb7@T}V@57{{M+P91i1YwqKu`*549>58=jCoM6jU?Ey*i5YIBn=(aH%l>MG?QXX0TOUFZWpp7(v8|L?tfiBzN_osLLF z4(eoy1R^RTA{`MqXmh?*`YcM5SuD%?Se8w)EQ@U-XMOS;9LM=Mj$7k64m(74d_2!5 zd7eiW&*N!;!IJ<3`TjplrUjTx^O?J(Mx%kuNRYvNjIh{CxKyz+?oZQXq60 z$jh5iJcGfY(BB|n=_;YdqeVl#gr6f4-gK#9$vuu7eH;Z&Kokd*yzB~spiqB!4_0~z zC4LK-*UdP2ryO4f7`%_}f=1JaU@K5uT%qJ;*K9T`xU6~T3u}>|3ZP`F6?;VoY9%Au z%R3<+0m6}#lHKxbHk*Q_&^d9{ z1))(y)p9?|PM?ME?karaf029i8wyPCV6TqAJq9>SPbqoXb-7#$wnQb&(=D*Jh_D9y zXq@_kib){1sssBw9>V<`*cTj9^0Mo8yVF=7*Fm3ZLQbj)w%HI0KZIbvaSpepR}h#5 zJTHL!QNTV5xNj~fp2y=!Q}EynuKgH8{QEN$MNdGgt59||=Y#OI4WoB?1N|S@ap3y2 zvh#YqNw3!{cXUq1Uh`pT2oF&E0S`$SPJ4ALw`438xBubJrAxRRp ziJVQlbBv!KRH@ZO(F9Q>PISyil!y?;{Y3J-J3`bRBMSErMGg^lMTrt!gQ`ekj=9+N E4>SF*8~^|S 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.45.2