doohoyi/lost-train
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reverting...

Browse source
This commit is contained in:
Dooho Yi 2020-05-06 12:17:19 +09:00
parent 53f0bb8673
commit fea9a7d99c
3 changed files with 2 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -7,7 +7,6 @@ INPUTDIR=$(BASEDIR)/content
OUTPUTDIR=$(CURDIR)/public OUTPUTDIR=$(CURDIR)/public
CONFFILE=$(BASEDIR)/pelicanconf.py CONFFILE=$(BASEDIR)/pelicanconf.py
PUBLISHCONF=$(BASEDIR)/publishconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py
CONFFILELOCAL=$(BASEDIR)/pelicanconf-localhost.py
DEBUG ?= 0 DEBUG ?= 0
@ -31,7 +30,6 @@ help:
@echo ' make serve [PORT=8000] serve site at http://localhost:8000' @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 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 [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 ssh_upload upload the web site via SSH '
@echo ' make rsync_upload upload the web site via rsync+ssh ' @echo ' make rsync_upload upload the web site via rsync+ssh '
@echo ' ' @echo ' '
@ -62,13 +60,6 @@ else
$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0 $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
endif 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: devserver:
ifdef PORT ifdef PORT
@ -81,4 +72,4 @@ publish:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) $(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

52
pelicanconf-localhost.py
View file

@ -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<category>[^/]*)/(?P<date>(?P<slug>\d{8}T\d{6})[+-]\d{4})_(?P<title>.*)/.*'
#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"

1
pelicanconf.py
View file

@ -40,6 +40,7 @@ DEFAULT_PAGINATION = 20
PAGINATED_TEMPLATES = {'index': None, 'tag': None, 'category': None, 'author': None} PAGINATED_TEMPLATES = {'index': None, 'tag': None, 'category': None, 'author': None}
TEMPLATE_PAGES = {'pages.html': 'pages.html'} TEMPLATE_PAGES = {'pages.html': 'pages.html'}
READERS = {'html': None} READERS = {'html': None}
#STATIC_PATHS = ['content']
# Uncomment following line if you want document-relative URLs when developing # Uncomment following line if you want document-relative URLs when developing
#RELATIVE_URLS = True #RELATIVE_URLS = True