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

Compare commits

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

9 Commits
2e42a6de1b ... 865273b6cc

Author SHA1 Message Date
masq
865273b6cc
[makefile] we need ssh-agent 2025-08-17 22:05:57 +02:00
masq
07792bbc99
[makefile] make prod pushed to www 2025-08-17 22:05:13 +02:00
masq
a46f14885d
makefile: git pull in make prod 2025-08-17 22:04:25 +02:00
masq
47d742087d
Makefile : add make prod 2025-08-17 22:00:18 +02:00
Linux User
ba1a2aa817 add make css to Makefile 2025-08-17 21:45:27 +02:00
masq
1140e472b0
[fix] theme compilation 2025-08-17 19:08:36 +02:00
masq
3e3ffdceff
[conf] disable pelican-toc 2025-08-17 18:38:47 +02:00
masq
077d1f21c3
[submodule] include CV as submodule 2025-08-17 18:38:23 +02:00
masq
7b9e38bc59
[sub] bump pelican-plugins version 2025-08-17 16:36:58 +02:00
9 changed files with 23 additions and 14 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[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

12
Makefile
View File

@ -1,5 +1,5 @@
PY?= PY?=
PELICAN?=pelican PELICAN?=/home/www-git/venv-pelican/bin/pelican
PELICANOPTS= PELICANOPTS=
BASEDIR=$(CURDIR) BASEDIR=$(CURDIR)
@ -47,6 +47,9 @@ 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)"
@ -66,7 +69,10 @@ 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) "$(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

1
content-submodules/cv Submodule

@ -0,0 +1 @@
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: /home/emixam/src/gitea.gitu.be/masq/cv/resume_fr.json :jsonresume: content-submodules/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: /home/emixam/src/gitea.gitu.be/masq/cv/resume_en.json :jsonresume: content-submodules/cv/resume_en.json
:jsonresume_fr: /home/emixam/src/gitea.gitu.be/masq/pysira-papyrus/language/fr.json :jsonresume_fr: content-submodules/cv/language/fr.json
:jsonresume_en: /home/emixam/src/gitea.gitu.be/masq/pysira-papyrus/language/en.json :jsonresume_en: content-submodules/cv/language/en.json

2
pelican-plugins

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

5
pelicanconf.py
View File

@ -42,7 +42,6 @@ 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'
] ]
@ -58,12 +57,12 @@ DISPLAY_PAGES_ON_MENU = True
I18N_SUBSITES = { I18N_SUBSITES = {
'fr': { 'fr': {
'SITEURL': 'http://127.0.0.1:8000/fr/', 'SITEURL': SITEURL + '/fr/',
'LOCALE': 'fr_FR.UTF-8', 'LOCALE': 'fr_FR.UTF-8',
'THEME_STATIC_DIR': '../theme', 'THEME_STATIC_DIR': '../theme',
}, },
'en': { 'en': {
'SITEURL': 'http://127.0.0.1:8000/en/', 'SITEURL': SITEURL + '/en/',
'LOCALE': 'en_US.UTF-8', 'LOCALE': 'en_US.UTF-8',
'THEME_STATIC_DIR': '../theme', 'THEME_STATIC_DIR': '../theme',
} }

4
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 = "" SITEURL = "https://m34f.ptrs.top"
RELATIVE_URLS = False RELATIVE_URLS = False
FEED_ALL_ATOM = "feeds/all.atom.xml" FEED_ALL_ATOM = "feeds/all.atom.xml"
@ -19,4 +19,4 @@ DELETE_OUTPUT_DIRECTORY = True
# Following items are often useful when publishing # Following items are often useful when publishing
# DISQUS_SITENAME = "" # DISQUS_SITENAME = ""
# GOOGLE_ANALYTICS = "" # GOOGLE_ANALYTICS = ""

2
theme

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