IGN:Planet now deployed at planet.calibre-ebook.com

This commit is contained in:
Kovid Goyal 2009-03-27 21:20:01 -07:00
parent 5ba21804da
commit b094f3bbb9
6 changed files with 37 additions and 7 deletions

View File

@ -4,10 +4,10 @@ from calibre.www.settings import DEBUG, TEMPLATE_DEBUG, ADMINS, MANAGERS, \
TEMPLATE_LOADERS, TEMPLATE_DIRS, MIDDLEWARE_CLASSES, MEDIA_ROOT, \
MEDIA_URL, ADMIN_MEDIA_PREFIX
DATABASE_USER = '' # Not used with sqlite3.
DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
if not DEBUG:
MEDIA_URL = 'http://planet.calibre-ebook.com/site_media/'
ADMIN_MEDIA_PREFIX = 'http://planet.calibre-ebook.com/admin_media/'
MEDIA_ROOT = '/usr/local/calibre/src/calibre/www/static/'
if DEBUG:
@ -28,7 +28,7 @@ else:
SECRET_KEY = open('/var/www/planet.calibre-ebook.com/django_secret_key').read().strip()
ROOT_URLCONF = 'planet.urls'
ROOT_URLCONF = 'calibre.www.planet.urls'
INSTALLED_APPS = (
'django.contrib.auth',

View File

@ -1,4 +1,4 @@
from django.conf.urls.defaults import patterns, include
from django.conf.urls.defaults import patterns, include, handler404, handler500
from django.conf import settings
# Uncomment the next two lines to enable the admin:
@ -7,7 +7,6 @@ admin.autodiscover()
urlpatterns = patterns('',
#(r'^admin/', include('django.contrib.admin.urls')),
(r'^admin/(.*)', admin.site.root),

View File

@ -72,6 +72,7 @@ if DEBUG:
)
else:
TEMPLATE_DIRS = (
'/usr/local/calibre/src/calibre/www/templates',
)

View File

@ -0,0 +1,12 @@
{% extends "base.html" %}
{% block title %}Page not found{% endblock %}
{% block header_text %}Page not found{% endblock %}
{% block content %}
<p>Sorry, but the requested page could not be found.</p>
{% endblock %}
{% block footer_text %} {% endblock %}

View File

@ -0,0 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="en">
<head>
<title>Page unavailable</title>
</head>
<body>
<h1>Page unavailable</h1>
<p>Sorry, but the requested page is unavailable due to a
server hiccup.</p>
<p>Our engineers have been notified, so check back later.</p>
</body>
</html>

View File

@ -23,10 +23,12 @@
</div>
<div id="_footer">
{% block footer_text %}
Created by Kovid Goyal.
Powered by <a href="http://www.djangoproject.com">
<img alt="Django" src="{{ media_url }}/img/button-django.png"/>
</a>&nbsp;&nbsp;
{% endblock %}
</div>
</body>
</html>