Permalink
Browse files

Removed redundant favicon.ico, updated lighttpd config to reflect, an…

…d setup.py because www is now empty by default.
  • Loading branch information...
1 parent 6cff8cd commit 6a370f9ea807bdfe0718862437aedf59e00120e2 @macropin macropin committed Apr 18, 2012
Showing with 11 additions and 15 deletions.
  1. +1 −1 deployment/lighttpd.conf
  2. +8 −14 setup.py
  3. +2 −0 www/.gitignore
  4. BIN www/media/favicon.ico
View
@@ -28,7 +28,7 @@ alias.url = (
url.rewrite-once = (
"^(/media.*)$" => "$1",
"^(/static.*)$" => "$1",
- "^/favicon\.ico$" => "/media/favicon.ico",
+ "^/favicon\.ico$" => "/static/tms/images/favicon.ico",
"^(/.*)$" => "/tms.fcgi$1",
)
View
@@ -40,18 +40,8 @@ def findall(dir, pattern='*'):
return all_files
-# Data files to package
-data_files = findall('www')
-data_files.extend([
- ('adlibre_tms', ['settings.py', 'local_settings.py.example', 'adlibre_tms/manage.py']),
- ('db', ['db/.gitignore']),
- ('deployment', find_files('deployment', '*')),
- ('docs', find_files('docs', '*')),
-])
-
-
setup(name='adlibre_tms',
- version='0.1.0',
+ version='0.1.1',
long_description=open('README.md').read(),
url='https://github.com/macropin/Adlibre-TMS',
packages=find_packages('.'),
@@ -91,7 +81,13 @@ def findall(dir, pattern='*'):
'templates/uni_form/*.html',
], # this should be done automatically
},
- data_files=data_files,
+ data_files=[
+ ('adlibre_tms', ['settings.py', 'local_settings.py.example', 'adlibre_tms/manage.py']),
+ ('db', ['db/.gitignore']), # create empty dir
+ ('deployment', find_files('deployment', '*')),
+ ('docs', find_files('docs', '*')),
+ ('www', 'www/.gitignore'), # create empty dir
+ ],
install_requires=[
'BeautifulSoup==3.2.0',
'Django==1.3.1',
@@ -104,8 +100,6 @@ def findall(dir, pattern='*'):
'template-utils==0.4p2',
'xml-models==0.5.1'
],
-# dependency_links = [
-# ],
)
View
@@ -0,0 +1,2 @@
+media
+static
View
Binary file not shown.

0 comments on commit 6a370f9

Please sign in to comment.