diff --git a/Makefile b/Makefile index f66f727..c429437 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ INPUTDIR=$(BASEDIR)/content OUTPUTDIR=$(CURDIR)/public CONFFILE=$(BASEDIR)/pelicanconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py -CONFFILELOCAL=$(BASEDIR)/pelicanconf-localhost.py DEBUG ?= 0 @@ -31,7 +30,6 @@ help: @echo ' make serve [PORT=8000] serve site at http://localhost:8000' @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 ' @echo ' make devserver [PORT=8000] serve and regenerate together ' - @echo ' make devserver-local [PORT=8000] serve and regenerate together ' @echo ' make ssh_upload upload the web site via SSH ' @echo ' make rsync_upload upload the web site via rsync+ssh ' @echo ' ' @@ -62,13 +60,6 @@ else $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0 endif -serve-local: -ifdef PORT - $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILELOCAL) $(PELICANOPTS) -p $(PORT) -else - $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILELOCAL) $(PELICANOPTS) -endif - devserver: ifdef PORT @@ -81,4 +72,4 @@ publish: $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) -.PHONY: html help clean regenerate serve serve-global devserver publish serve-local +.PHONY: html help clean regenerate serve serve-global devserver publish diff --git a/pelicanconf-localhost.py b/pelicanconf-localhost.py deleted file mode 100644 index 6e96b1d..0000000 --- a/pelicanconf-localhost.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- # -from __future__ import unicode_literals - -AUTHOR = 'D' -SITENAME = 'lost/tr' -#SITEURL = 'https://nosignal.hopto.org/site/ci/losttr' -SITEURL = 'localhost:8000' - -PATH = 'content' -OUTPUT_PATH = 'public' - -TIMEZONE = 'Asia/Seoul' - -DEFAULT_LANG = 'en' -DEFAULT_DATE = 'fs' -#posts/notes/20200421T223234+0900_testt/index.rst -PATH_METADATA = r'.*/(?P[^/]*)/(?P(?P\d{8}T\d{6})[+-]\d{4})_(?P.*)/.*' - -#SLUGIFY_SOURCE = 'basename' - -# 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 - -# Blogroll -LINKS = (('Pelican', 'http://getpelican.com/'), - ('Python.org', 'http://python.org/'), - ('Jinja2', 'http://jinja.pocoo.org/'), - ('You can modify those links in your config file', '#'),) - -# Social widget -SOCIAL = (('You can add links in your config file', '#'), - ('Another social link', '#'),) - -DEFAULT_PAGINATION = 20 -PAGINATED_TEMPLATES = {'index': None, 'tag': None, 'category': None, 'author': None} -TEMPLATE_PAGES = {'pages.html': 'pages.html'} -READERS = {'html': None} - -# Uncomment following line if you want document-relative URLs when developing -#RELATIVE_URLS = True - -# PLUGINS -PLUGIN_PATHS = ['plugins'] -PLUGINS = ['assets'] - -# THEME (custom;originally 'monospace') -THEME = "./theme" diff --git a/pelicanconf.py b/pelicanconf.py index dd86ef5..fe55798 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -40,6 +40,7 @@ DEFAULT_PAGINATION = 20 PAGINATED_TEMPLATES = {'index': None, 'tag': None, 'category': None, 'author': None} TEMPLATE_PAGES = {'pages.html': 'pages.html'} READERS = {'html': None} +#STATIC_PATHS = ['content'] # Uncomment following line if you want document-relative URLs when developing #RELATIVE_URLS = True