AENC/cwi-pelican-template-fork Changeset - 14dfff128751 · Centrum Wiskunde & Informatica (CWI)

Changeset - 14dfff128751

Parent rev.

Child rev.

[Not reviewed]

master

0 3 1

Michael Guravage (guravage) - 11 years ago 2015-01-27 10:31:41
m.a.guravage@cwi.nl

Changes facilitate publication, e.g., SITEURL defined in publishconf.py, URLs suffixes removed and Makefile SSH variable assigned realistic values.

Changes to be committed:
modified: Makefile
new file: content/extras/top-htaccess
modified: pelicanconf.py
modified: publishconf.py

4 files changed with 40 insertions and 18 deletions:

projects/cwi/Makefile

projects/cwi/content/extras/top-htaccess

projects/cwi/pelicanconf.py

projects/cwi/publishconf.py

0 comments (0 inline, 0 general)

projects/cwi/Makefile

➞

Show inline comments

@@ @@ -12,10 +12,10 @@ FTP_HOST=localhost @@
 FTP_USER=anonymous
 FTP_TARGET_DIR=/
-SSH_HOST=localhost
+SSH_HOST=desktop.cwi.nl
 SSH_PORT=22
 SSH_USER=root
 SSH_TARGET_DIR=/var/www
 SSH_USER=$(USER)
 SSH_TARGET_DIR=/cwi/www/homepages/cws/<project-name>
 S3_BUCKET=my_s3_bucket

projects/cwi/content/extras/top-htaccess

➞

Show inline comments

		new file 100644
		Options +MultiViews

projects/cwi/pelicanconf.py

➞

Show inline comments

@@ @@ -3,21 +3,18 @@ @@
 from __future__ import unicode_literals
 AUTHOR = u'M.A. Guravage'
 DEFAULT_LANG = u'en'
 PATH = 'content'
 SITENAME = u'CWI Pelican Template'
 SITEURL = ''
 PATH = 'content'
 TIMEZONE = 'Europe/Amsterdam'
 DEFAULT_LANG = u'en'
 # Feed generation is usually not desired when developing
 FEED_ALL_ATOM = None
 CATEGORY_FEED_ATOM = None
 TRANSLATION_FEED_ATOM = None
 AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 CATEGORY_FEED_ATOM = None
 FEED_ALL_ATOM = None
 TRANSLATION_FEED_ATOM = None
 # Blogroll
 LINKS = (('CWI', 'http://www.cwi.nl'),
@@ @@ -28,24 +25,47 @@ LINKS = (('CWI', 'http://www.cwi.nl'), @@
 SOCIAL = (('twitter', 'https://twitter.com/CWInl'),
           ('github', 'http://github.com'),)
 STATIC_PATHS = ['static', 'images', 'private', 'extras/.htaccess', 'extras/.htpassword', 'extras/favicon.ico']
 PAGE_PATHS = ['pages']
 STATIC_PATHS = ['static', 'images', 'private',
                 'extras/.htaccess', 'extras/.htpassword',
                 'extras/top-htaccess', 'extras/favicon.ico']
 ARTICLE_PATHS = ['News']
 ARTICLE_URL = 'articles/{slug}.html'
 ARTICLE_SAVE_AS = 'articles/{slug}.html'
 ARTICLE_URL = 'news/{slug}'
 ARTICLE_SAVE_AS = 'news/{slug}.html'
 # AUTHOR_URL = 'speakers/{slug}'
 # AUTHOR_SAVE_AS = 'speakers/{slug}.html'
 # AUTHORS_URL = 'speakers'
 # AUTHORS_SAVE_AS = 'speakers/index.html'
 CATEGORY_URL = 'category/{slug}'
 CATEGORY_SAVE_AS = 'category/{slug}.html'
 PAGE_PATHS = ['pages']
 PAGE_URL = 'pages/{slug}'
 DEFAULT_PAGINATION = 10
 USE_FOLDER_AS_CATEGORY = True
 DISPLAY_CATEGORIES_ON_MENU = True
 DISPLAY_PAGES_ON_MENU = True
 LOAD_CONTENT_CACHE = False
 USE_FOLDER_AS_CATEGORY = True
 EXTRA_PATH_METADATA = {
     'extras/.htaccess': {'path': 'private/.htaccess'},
     'extras/.htpassword': {'path': 'private/.htpassword'},
     'extras/favicon.ico': {'path': 'favicon.ico'}
     'extras/favicon.ico': {'path': 'favicon.ico'},
     'extras/top-htaccess': {'path': '.htaccess'},
+    }
 # DIRECT_TEMPLATES = ('authors', 'archives', 'tags')
 # MENUITEMS = [
 #     ('Welcome', ''),
 #     ('Presentations', '/category/presentations'),
 #     ('Speakers', '/speakers'),
 #     ('Tags', '/tags'),
 #     ('Archives', '/archives'),
 # ]
 THEME = 'cwi'
 # Uncomment following line if you want document-relative URLs when developing

projects/cwi/publishconf.py

➞

Show inline comments

@@ @@ -10,8 +10,9 @@ import sys @@
 sys.path.append(os.curdir)
 from pelicanconf import *
 SITEURL = ''
+SITEURL = 'http://event.cwi.nl/<project-name>'
 RELATIVE_URLS = False
 #MENUITEMS = [(title, ''.join((SITEURL, url))) for title, url in MENUITEMS]
 FEED_ALL_ATOM = 'feeds/all.atom.xml'
 CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'

0 comments (0 inline, 0 general)