diff --git a/.gitignore b/.gitignore index 7eefae5..59770ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ cache/* +cache-full/* +cache-html/* output/* __pycache__ wiki/trash diff --git a/Makefile b/Makefile index 58d0f5b..58054c6 100644 --- a/Makefile +++ b/Makefile @@ -5,5 +5,5 @@ pdf: pelican -s pelicanconf-full.py clean: - rm -rf cache __pycache__ + rm -rf cache-html cache-full cache __pycache__ diff --git a/pelicanconf-full.py b/pelicanconf-full.py index f2e27c3..b6ca9e5 100644 --- a/pelicanconf-full.py +++ b/pelicanconf-full.py @@ -35,6 +35,7 @@ SITENAME = 'ДСП' SITEURL = 'https://dsp.246060.ru' PATH = 'wiki' +CACHE_PATH = 'cache-full' TIMEZONE = 'Europe/Moscow' @@ -84,7 +85,7 @@ I18N_GETTEXT_DOMAIN = 'messages' JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] -PLUGINS = [i18n(), "pandoc_reader", "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "plantuml"] +PLUGINS = [i18n(), "pandoc_reader", "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "plantuml", "replacer"] #PLUGINS = ["better_tables", "just_table"] PDF_PROCESSOR = True @@ -117,6 +118,11 @@ PANDOC_MARKDOWN_EXTENSIONS = [ PANDOC_EXTENSIONS = PANDOC_MARKDOWN_EXTENSIONS +REPLACES = ( + (u'output/images/', u'images/'), +) + + YUICOMPRESSOR_EXECUTABLE = "yui-compressor" YUICOMPRESSOR_EXTRA_OPTIONS = ["--nomunge"] PLUGINS += ["yuicompressor-opt"] diff --git a/pelicanconf.py b/pelicanconf.py index 97e4c6c..a20fd2d 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -35,6 +35,7 @@ SITENAME = 'ДСП' SITEURL = 'https://dsp.246060.ru' PATH = 'wiki' +CACHE_PATH = 'cache-html' TIMEZONE = 'Europe/Moscow'