archive/theorangeone.net-legacy
Archived
1
Fork 0
Code Releases Packages Activity

move config to seperate directory

Browse source
This commit is contained in:
Jake Howard 2016-09-08 21:24:39 +01:00
parent 3b335eb766
commit 523cd966d2
Signed by: jake
GPG key ID: 57AFB45680EDD477
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -6,6 +6,7 @@ PELICAN=$(ENV)/pelican
OUTPUTDIR=$(BASEDIR)/output OUTPUTDIR=$(BASEDIR)/output
PLUGINS_DIR=$(BASEDIR)/pelican_plugins PLUGINS_DIR=$(BASEDIR)/pelican_plugins
DEPLOY_DIR=$(BASEDIR)/deploy DEPLOY_DIR=$(BASEDIR)/deploy
CONFIG_FILE=$(BASEDIR)/config/pelicanconf.py
FLAKE8_IGNORE=--ignore=E128,E501,E401,E402 FLAKE8_IGNORE=--ignore=E128,E501,E401,E402
@ -17,7 +18,7 @@ build: install
npm run build-js npm run build-js
npm run build-scss npm run build-scss
@echo ">> Building pelican..." @echo ">> Building pelican..."
$(PELICAN) -o $(OUTPUTDIR) -v $(PELICAN) -o $(OUTPUTDIR) -vs $(CONFIG_FILE)
mv $(OUTPUTDIR)/assets/robots.txt $(OUTPUTDIR) mv $(OUTPUTDIR)/assets/robots.txt $(OUTPUTDIR)
cp -R $(OUTPUTDIR)/assets/* $(OUTPUTDIR)/static cp -R $(OUTPUTDIR)/assets/* $(OUTPUTDIR)/static
rm -rf $(OUTPUTDIR)/assets rm -rf $(OUTPUTDIR)/assets

14
pelicanconf.py → config/pelicanconf.py
View file

@ -2,17 +2,17 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from git import Repo from git import Repo
import sys, os import sys, os
sys.path.insert(0, os.path.realpath('./plugins')) sys.path.insert(0, os.path.realpath('./'))
# Global core settings # Global core settings
AUTHOR = 'Jake Howard' AUTHOR = 'Jake Howard'
SITENAME = 'TheOrangeOne' SITENAME = 'TheOrangeOne'
SITEURL = 'http://theorangeone.net' SITEURL = 'http://theorangeone.net'
PATH = 'content' PATH = '../content'
TIMEZONE = 'Europe/London' TIMEZONE = 'Europe/London'
DEFAULT_LANG = 'en' DEFAULT_LANG = 'en'
PAGE_PATHS = ["pages"] PAGE_PATHS = ["pages"]
THEME = "theme" THEME = "../theme"
THEME_STATIC_DIR = "static" THEME_STATIC_DIR = "static"
THEME_STATIC_PATHS = ["static/build"] THEME_STATIC_PATHS = ["static/build"]
STATIC_PATHS = ["assets"] STATIC_PATHS = ["assets"]
@ -22,7 +22,7 @@ DEFAULT_PAGINATION = False
SLUGIFY_SOURCE = 'basename' SLUGIFY_SOURCE = 'basename'
# Social widget # Social widget
import links from plugins import links
ACCOUNTS = links.accounts() ACCOUNTS = links.accounts()
FOOTER_LINKS = links.footer() FOOTER_LINKS = links.footer()
INDEX_PROJECTS = links.index_projects() INDEX_PROJECTS = links.index_projects()
@ -30,7 +30,7 @@ INDEX_PROJECTS = links.index_projects()
# Extra config # Extra config
REPO = Repo(search_parent_directories=True) REPO = Repo(search_parent_directories=True)
BUILD_PRODUCTION = 'BUILD_PRODUCTION' in os.environ BUILD_PRODUCTION = 'BUILD_PRODUCTION' in os.environ
import image_resizer from plugins import image_resizer
META_IMAGES = image_resizer.generate() META_IMAGES = image_resizer.generate()
# Disable some pages # Disable some pages
@ -58,7 +58,7 @@ FEED_ATOM = 'feed.atom'
FEED_DOMAIN = SITEURL FEED_DOMAIN = SITEURL
# Setup plugins # Setup plugins
PLUGIN_PATHS = ["pelican_plugins", "plugins"] PLUGIN_PATHS = ["../pelican_plugins", "../plugins"]
PLUGINS = [ PLUGINS = [
"sitemap", "sitemap",
"filetime_from_git", "filetime_from_git",
@ -94,7 +94,7 @@ MD_EXTENSIONS = [
] ]
# Setup jinja2 filters # Setup jinja2 filters
import filters from plugins import filters
JINJA_FILTERS = { JINJA_FILTERS = {
"datetime": filters.format_datetime, "datetime": filters.format_datetime,
"category_find": filters.category_find, "category_find": filters.category_find,