masq/homepage-mfalves
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: masq:865273b6cc901f70e4e4955743e48ee08c5a491b
Branches Tags
masq:master
masq:local
..
compare: masq:2e42a6de1b10e41b33d504463d1710e92a54f812
Branches Tags
masq:master
masq:local

No commits in common. "865273b6cc901f70e4e4955743e48ee08c5a491b" and "2e42a6de1b10e41b33d504463d1710e92a54f812" have entirely different histories.
865273b6cc ... 2e42a6de1b

9 changed files with 14 additions and 23 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,6 +7,3 @@
[submodule "pelican-custom-plugins/jsonresume"] [submodule "pelican-custom-plugins/jsonresume"]
path = pelican-custom-plugins/jsonresume path = pelican-custom-plugins/jsonresume
url = ssh://gitea@gitea.gitu.be:2222/masq/pelican-plugin-jsonresume.git 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

10
Makefile
View File

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

1
content-submodules/cv

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

2
content/pages/resume.jsonresume
View File

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

6
content/pages/resume_en.jsonresume
View File

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

2
pelican-plugins

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

5
pelicanconf.py
View File

@ -42,6 +42,7 @@ THEME = "./theme"
THEME_STATIC_PATHS = ['static'] THEME_STATIC_PATHS = ['static']
PLUGIN_PATHS = ['pelican-plugins', 'pelican-custom-plugins'] PLUGIN_PATHS = ['pelican-plugins', 'pelican-custom-plugins']
PLUGINS = ['readtime','neighbors' PLUGINS = ['readtime','neighbors'
,'pelican-toc'
, 'jsonresume' , 'jsonresume'
, 'i18n_subsites' , 'i18n_subsites'
] ]
@ -57,12 +58,12 @@ DISPLAY_PAGES_ON_MENU = True
I18N_SUBSITES = { I18N_SUBSITES = {
'fr': { 'fr': {
'SITEURL': SITEURL + '/fr/', 'SITEURL': 'http://127.0.0.1:8000/fr/',
'LOCALE': 'fr_FR.UTF-8', 'LOCALE': 'fr_FR.UTF-8',
'THEME_STATIC_DIR': '../theme', 'THEME_STATIC_DIR': '../theme',
}, },
'en': { 'en': {
'SITEURL': SITEURL + '/en/', 'SITEURL': 'http://127.0.0.1:8000/en/',
'LOCALE': 'en_US.UTF-8', 'LOCALE': 'en_US.UTF-8',
'THEME_STATIC_DIR': '../theme', 'THEME_STATIC_DIR': '../theme',
} }

2
publishconf.py
View File

@ -8,7 +8,7 @@ sys.path.append(os.curdir)
from pelicanconf import * from pelicanconf import *
# If your site is available via HTTPS, make sure SITEURL begins with https:// # If your site is available via HTTPS, make sure SITEURL begins with https://
SITEURL = "https://m34f.ptrs.top" SITEURL = ""
RELATIVE_URLS = False RELATIVE_URLS = False
FEED_ALL_ATOM = "feeds/all.atom.xml" FEED_ALL_ATOM = "feeds/all.atom.xml"

2
theme

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