Makefile

@@ -1,5 +1,5 @@
 PY?=
-PELICAN?=/home/www-git/venv-pelican/bin/pelican
+PELICAN?=pelican
 PELICANOPTS=
 
 BASEDIR=$(CURDIR)
@@ -47,9 +47,6 @@ help:
 html:
 	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
-css:
-	cd ./theme && $(MAKE) all
-
 clean:
 	[ ! -d "$(OUTPUTDIR)" ] || rm -rf "$(OUTPUTDIR)"
 
@@ -69,10 +66,7 @@ devserver-global:
 	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b 0.0.0.0
 
 publish:
-	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS) && cd theme && make
-
-prod:
-	git push www && ssh -A www-git@www.freepinc.dev "cd m34f.ptrs.top && git pull --recurse-submodules=yes && make publish"
+	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
 
 
-.PHONY: html help clean regenerate serve serve-global devserver devserver-global publish 
+.PHONY: html help clean regenerate serve serve-global devserver devserver-global publish 

pelicanconf.py

@@ -57,12 +57,12 @@ DISPLAY_PAGES_ON_MENU = True
 
 I18N_SUBSITES = {
     'fr': {
-        'SITEURL':  SITEURL + '/fr/',
+        'SITEURL': 'http://127.0.0.1:8000/fr/',
         'LOCALE': 'fr_FR.UTF-8',
         'THEME_STATIC_DIR': '../theme',
     },
     'en': {
-        'SITEURL':  SITEURL + '/en/',
+        'SITEURL': 'http://127.0.0.1:8000/en/',
         'LOCALE': 'en_US.UTF-8',
         'THEME_STATIC_DIR': '../theme',
     }

publishconf.py

@@ -8,7 +8,7 @@ sys.path.append(os.curdir)
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = "https://m34f.ptrs.top"
+SITEURL = ""
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = "feeds/all.atom.xml"
@@ -19,4 +19,4 @@ DELETE_OUTPUT_DIRECTORY = True
 # Following items are often useful when publishing
 
 # DISQUS_SITENAME = ""
-# GOOGLE_ANALYTICS = ""
+# GOOGLE_ANALYTICS = ""

theme

@@ -1 +1 @@
-Subproject commit 0c7ec9135796c698b683bf43ed77182818b1b316
+Subproject commit 70795a1b753341ce211732b5ffd2f46ef3f9a5a5