Do a cleaner package.

Add an Apache sample configuration file
Update README with better installation instructions
This commit is contained in:
Grégory Soutadé 2014-02-02 14:21:16 +01:00
parent ef03d87799
commit 0d05f8346b
353 changed files with 115 additions and 38 deletions

13
README
View File

@ -1,16 +1,21 @@
Dynastie is static blog generator delivered under GPL v3 licence terms. Dynastie is static blog generator delivered under GPL v3 licence terms.
Current version is 0.1 Current version is 0.2
Requirements : Requirements :
Django >= 1.4, libapache2-mod-wsgi if you want to use Dynastie with Apache. PyGments (Optional). Django >= 1.4, libapache2-mod-wsgi if you want to use Dynastie with Apache. PyGments (Optional).
Installation : Installation :
Download Dynastie. Copy dynastie.bdd.init in dynastie.bdd and update wsgy.py (with $PWD/..). Then you can create a blog*, users**, categories, posts and generate your blog ! * Download Dynastie
* Update wsgy.py (with $PWD/..)
* Run ./manage.sh syncdb and create a superuser
* Run ./manage.sh runserver
or
* Copy (and edit) apache_dynastie.conf in /etc/apache2/sites-available, and create a symbolic link from /etc/apache2/sites-enabled to /etc/apache2/sites-available
Then you can create users*, blog, categories, posts and generate your blog !
*Be careful : $(blog.name) must be an URI like "blog.soutade.fr", it will be used like this in some parts of Dynastie. *Be careful : $(blog.name) must be an URI like "blog.soutade.fr", it will be used like this in some parts of Dynastie.
**There is an existing user : admin/admin
More information can be found at http://indefero.soutade.fr/p/dynastie More information can be found at http://indefero.soutade.fr/p/dynastie

19
apache_dynastie.conf Normal file
View File

@ -0,0 +1,19 @@
<VirtualHost *>
ServerName dynastie.soutade.fr
DocumentRoot /home/soutade/dynastie/dynastie/
WSGIScriptAlias / /home/soutade/dynastie/dynastie/wsgi.py
Alias /static /home/soutade/dynastie/dynastie/static
<Directory /home/soutade/dynastie/dynastie>
<IfVersion < 2.3 >
Order allow,deny
Allow from all
</IfVersion>
<IfVersion >= 2.3>
Require all granted
</IfVersion>
</Directory>
</VirtualHost>

Binary file not shown.

0
UserProfile.py → dynastie/UserProfile.py Normal file → Executable file
View File

0
__init__.py → dynastie/__init__.py Normal file → Executable file
View File

1
forms.py → dynastie/forms.py Normal file → Executable file
View File

@ -46,7 +46,6 @@ class CategoryForm(ModelForm):
class UserForm(ModelForm): class UserForm(ModelForm):
class Meta: class Meta:
model = User model = User
exclude = ('password')
class CommentForm(ModelForm): class CommentForm(ModelForm):
class Meta: class Meta:

View File

View File

View File

@ -48,7 +48,12 @@ class Archive(Index):
dom = self.parseTemplate(blog, src, output, 'archive', 'archive') dom = self.parseTemplate(blog, src, output, 'archive', 'archive')
if dom is None: return self.report if dom is None: return self.report
first_post = Post.objects.filter(published=True, front_page=True).order_by('creation_date')[0] posts = Post.objects.filter(published=True, front_page=True).order_by('creation_date')
if len(posts) == 0:
return self.report
first_post = posts[0]
last_post = Post.objects.filter(published=True, front_page=True).order_by('-creation_date')[0] last_post = Post.objects.filter(published=True, front_page=True).order_by('-creation_date')[0]
start_year = first_post.creation_date.year start_year = first_post.creation_date.year

0
generators/atom.py → dynastie/generators/atom.py Normal file → Executable file
View File

View File

View File

0
generators/index.py → dynastie/generators/index.py Normal file → Executable file
View File

View File

0
generators/post.py → dynastie/generators/post.py Normal file → Executable file
View File

0
generators/rss.py → dynastie/generators/rss.py Normal file → Executable file
View File

0
generators/search.py → dynastie/generators/search.py Normal file → Executable file
View File

0
generators/tag.py → dynastie/generators/tag.py Normal file → Executable file
View File

0
models.py → dynastie/models.py Normal file → Executable file
View File

0
search.py → dynastie/search.py Normal file → Executable file
View File

2
settings.py → dynastie/settings.py Normal file → Executable file
View File

@ -26,7 +26,7 @@ TEMPLATE_DEBUG = DEBUG
if not 'DYNASTIE_ROOT' in os.environ: if not 'DYNASTIE_ROOT' in os.environ:
# manage.py # manage.py
dynastie_root = os.getcwd() dynastie_root = os.getcwd() + '/dynastie/'
else: else:
# Apache # Apache
dynastie_root = os.environ['DYNASTIE_ROOT'] dynastie_root = os.environ['DYNASTIE_ROOT']

View File

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
static/js/aes.js → dynastie/static/js/aes.js Normal file → Executable file
View File

View File

0
static/js/sha1.js → dynastie/static/js/sha1.js Normal file → Executable file
View File

View File

@ -4,6 +4,6 @@
var tinyMCETemplateList = [ var tinyMCETemplateList = [
// Name, URL, Description // Name, URL, Description
["Simple snippet", "templates/snippet1.htm", "Simple HTML snippet."], ["Simple snippet", "snippet1.htm", "Simple HTML snippet."],
["Layout", "templates/layout1.htm", "HTML Layout."] ["Layout", "layout1.htm", "HTML Layout."]
]; ];

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Some files were not shown because too many files have changed in this diff Show More