Compare commits

...

6 Commits

Author SHA1 Message Date
865273b6cc
[makefile] we need ssh-agent 2025-08-17 22:05:57 +02:00
07792bbc99
[makefile] make prod pushed to www 2025-08-17 22:05:13 +02:00
a46f14885d
makefile: git pull in make prod 2025-08-17 22:04:25 +02:00
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
1140e472b0
[fix] theme compilation 2025-08-17 19:08:36 +02:00
4 changed files with 14 additions and 8 deletions

View File

@ -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

View File

@ -57,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',
}

View File

@ -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 = ""

2
theme

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