Skip to content

Commit

Permalink
Removed redundant favicon.ico, updated lighttpd config to reflect, an…
Browse files Browse the repository at this point in the history
…d setup.py because www is now empty by default.
  • Loading branch information
macropin committed Apr 18, 2012
1 parent 6cff8cd commit 6a370f9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion deployment/lighttpd.conf
Expand Up @@ -28,7 +28,7 @@ alias.url = (
url.rewrite-once = ( url.rewrite-once = (
"^(/media.*)$" => "$1", "^(/media.*)$" => "$1",
"^(/static.*)$" => "$1", "^(/static.*)$" => "$1",
"^/favicon\.ico$" => "/media/favicon.ico", "^/favicon\.ico$" => "/static/tms/images/favicon.ico",
"^(/.*)$" => "/tms.fcgi$1", "^(/.*)$" => "/tms.fcgi$1",
) )


Expand Down
22 changes: 8 additions & 14 deletions setup.py
Expand Up @@ -40,18 +40,8 @@ def findall(dir, pattern='*'):
return all_files 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', setup(name='adlibre_tms',
version='0.1.0', version='0.1.1',
long_description=open('README.md').read(), long_description=open('README.md').read(),
url='https://github.com/macropin/Adlibre-TMS', url='https://github.com/macropin/Adlibre-TMS',
packages=find_packages('.'), packages=find_packages('.'),
Expand Down Expand Up @@ -91,7 +81,13 @@ def findall(dir, pattern='*'):
'templates/uni_form/*.html', 'templates/uni_form/*.html',
], # this should be done automatically ], # 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=[ install_requires=[
'BeautifulSoup==3.2.0', 'BeautifulSoup==3.2.0',
'Django==1.3.1', 'Django==1.3.1',
Expand All @@ -104,8 +100,6 @@ def findall(dir, pattern='*'):
'template-utils==0.4p2', 'template-utils==0.4p2',
'xml-models==0.5.1' 'xml-models==0.5.1'
], ],
# dependency_links = [
# ],
) )




2 changes: 2 additions & 0 deletions www/.gitignore
@@ -0,0 +1,2 @@
media
static
Binary file removed www/media/favicon.ico
Binary file not shown.

0 comments on commit 6a370f9

Please sign in to comment.