[makefile] we need ssh-agent

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "pelican-custom-plugins/jsonresume"]
 	path = pelican-custom-plugins/jsonresume
 	url = ssh://gitea@gitea.gitu.be:2222/masq/pelican-plugin-jsonresume.git
+[submodule "content-submodules/cv"]
+	path = content-submodules/cv
+	url = ssh://gitea@gitea.gitu.be:2222/masq/cv.git

Makefile

@@ -1,5 +1,5 @@
 PY?=
-PELICAN?=pelican
+PELICAN?=/home/www-git/venv-pelican/bin/pelican
 PELICANOPTS=
 
 BASEDIR=$(CURDIR)
@@ -47,6 +47,9 @@ help:
 html:
 	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
+css:
+	cd ./theme && $(MAKE) all
+
 clean:
 	[ ! -d "$(OUTPUTDIR)" ] || rm -rf "$(OUTPUTDIR)"
 
@@ -66,7 +69,10 @@ devserver-global:
 	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b 0.0.0.0
 
 publish:
-	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
+	"$(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"
 
 
-.PHONY: html help clean regenerate serve serve-global devserver devserver-global publish 
+.PHONY: html help clean regenerate serve serve-global devserver devserver-global publish 

content-submodules/cv

@@ -0,0 +1 @@
+Subproject commit 7d26aec62456b854741c98aa6bf7060d4d82dcef

content/pages/resume.jsonresume

@@ -10,4 +10,4 @@ CV
 :summary: présentation
 :template: resume
 :lang: fr
-:jsonresume: /home/emixam/src/gitea.gitu.be/masq/cv/resume_fr.json
+:jsonresume: content-submodules/cv/resume_fr.json

content/pages/resume_en.jsonresume

@@ -10,6 +10,6 @@ Resume
 :summary: présentation
 :template: resume
 :lang: en
-:jsonresume: /home/emixam/src/gitea.gitu.be/masq/cv/resume_en.json
-:jsonresume_fr: /home/emixam/src/gitea.gitu.be/masq/pysira-papyrus/language/fr.json
-:jsonresume_en: /home/emixam/src/gitea.gitu.be/masq/pysira-papyrus/language/en.json
+:jsonresume: content-submodules/cv/resume_en.json
+:jsonresume_fr: content-submodules/cv/language/fr.json
+:jsonresume_en: content-submodules/cv/language/en.json

pelican-plugins

@@ -1 +1 @@
-Subproject commit 48d743f410c15498b27e5038ea645be65c682802
+Subproject commit a58561bfa204b8dbd61858cf9de400f99825c83e

pelicanconf.py

@@ -42,7 +42,6 @@ THEME = "./theme"
 THEME_STATIC_PATHS = ['static']
 PLUGIN_PATHS = ['pelican-plugins', 'pelican-custom-plugins']
 PLUGINS = ['readtime','neighbors'
-,'pelican-toc'
 , 'jsonresume'
 , 'i18n_subsites'
 ]
@@ -58,12 +57,12 @@ DISPLAY_PAGES_ON_MENU = True
 
 I18N_SUBSITES = {
     'fr': {
-        'SITEURL': 'http://127.0.0.1:8000/fr/',
+        'SITEURL':  SITEURL + '/fr/',
         'LOCALE': 'fr_FR.UTF-8',
         'THEME_STATIC_DIR': '../theme',
     },
     'en': {
-        'SITEURL': 'http://127.0.0.1:8000/en/',
+        'SITEURL':  SITEURL + '/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 = ""
+SITEURL = "https://m34f.ptrs.top"
 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 70795a1b753341ce211732b5ffd2f46ef3f9a5a5
+Subproject commit 0c7ec9135796c698b683bf43ed77182818b1b316