From 370b8efb4bc4fa389363c996891e0a02e32bb5a4 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 23 May 2019 11:45:57 +0200 Subject: [PATCH] Add talks --- Makefile | 39 ++++++++---------- content/pages/index.md | 1 + .../pages/stegano/crypto-fa6tuodiethaiZ1.md | 2 +- .../pages/stegano/crypto-pohxoh6Waegidoh.md | 2 +- content/pages/talks.md | 41 +++++++++++++++++++ pelicanconf.py | 16 +++----- publishconf.py | 16 ++++---- 7 files changed, 73 insertions(+), 44 deletions(-) create mode 100644 content/pages/talks.md diff --git a/Makefile b/Makefile index b9d608c..facc873 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PELICANOPTS= BASEDIR=$(CURDIR) INPUTDIR=$(BASEDIR)/content -OUTPUTDIR=$(BASEDIR)/output/ +OUTPUTDIR=$(BASEDIR)/output CONFFILE=$(BASEDIR)/pelicanconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py @@ -13,7 +13,6 @@ SSH_PORT=22 SSH_USER=mdk SSH_TARGET_DIR=/var/www/mdk/ -GITHUB_PAGES_BRANCH=gh-pages DEBUG ?= 0 ifeq ($(DEBUG), 1) @@ -25,9 +24,6 @@ ifeq ($(RELATIVE), 1) PELICANOPTS += --relative-urls endif -html: - $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) - help: @echo 'Makefile for a pelican Web site ' @echo ' ' @@ -38,16 +34,17 @@ help: @echo ' make publish generate using production settings ' @echo ' make serve [PORT=8000] serve site at http://localhost:8000' @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 ' - @echo ' make devserver [PORT=8000] start/restart develop_server.sh ' - @echo ' make stopserver stop local server ' + @echo ' make devserver [PORT=8000] serve and regenerate together ' @echo ' make ssh_upload upload the web site via SSH ' @echo ' make rsync_upload upload the web site via rsync+ssh ' - @echo ' make github upload the web site via gh-pages ' @echo ' ' @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html ' @echo 'Set the RELATIVE variable to 1 to enable relative urls ' @echo ' ' +html: + $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) + clean: [ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR) @@ -56,38 +53,34 @@ regenerate: serve: ifdef PORT - cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT) + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) else - cd $(OUTPUTDIR) && $(PY) -m pelican.server + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) endif serve-global: ifdef SERVER - cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER) + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER) else - cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0 + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0 endif devserver: ifdef PORT - $(BASEDIR)/develop_server.sh restart $(PORT) + $(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) else - $(BASEDIR)/develop_server.sh restart + $(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) endif -stopserver: - $(BASEDIR)/develop_server.sh stop - @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.' - publish: $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) +ssh_upload: publish + scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) + rsync_upload: publish - rsync -e "ssh -p $(SSH_PORT)" -P -rvzc $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude - -rsync: - rsync -e "ssh -p $(SSH_PORT)" -P -rvzc $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude + rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) -.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload rsync +.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload diff --git a/content/pages/index.md b/content/pages/index.md index 6770707..8a0c8b0 100644 --- a/content/pages/index.md +++ b/content/pages/index.md @@ -8,6 +8,7 @@ status: hidden CPython core developer, independent Python trainer, working part-time for [meltygroup](https://meltygroup.com). +- [My talks]({filename}/pages/talks.md) - My projects - Translating the [Python documentation in French](https://docs.python.org/fr/). - Teaching Python and Cybersecurity at [supinternet](http://supinternet.fr). diff --git a/content/pages/stegano/crypto-fa6tuodiethaiZ1.md b/content/pages/stegano/crypto-fa6tuodiethaiZ1.md index c2d1a2f..75ca233 100644 --- a/content/pages/stegano/crypto-fa6tuodiethaiZ1.md +++ b/content/pages/stegano/crypto-fa6tuodiethaiZ1.md @@ -3,4 +3,4 @@ title: Steganography slug: crypto-fa6tuodiethaiZ1 robots: noindex -![cat]({filename}/images/cat.jpg) +![cat]({static}/images/cat.jpg) diff --git a/content/pages/stegano/crypto-pohxoh6Waegidoh.md b/content/pages/stegano/crypto-pohxoh6Waegidoh.md index eb21bf3..44a0aec 100644 --- a/content/pages/stegano/crypto-pohxoh6Waegidoh.md +++ b/content/pages/stegano/crypto-pohxoh6Waegidoh.md @@ -3,4 +3,4 @@ title: Steganography slug: crypto-pohxoh6Waegidoh robots: noindex -![cat]({filename}/images/cat.png) +![cat]({static}/images/cat.png) diff --git a/content/pages/talks.md b/content/pages/talks.md new file mode 100644 index 0000000..c10ea4e --- /dev/null +++ b/content/pages/talks.md @@ -0,0 +1,41 @@ +Title: Talks +Date: 2008-08-14 19:25:52 +status: hidden + +## Upcoming + +- 2019-06-13: + [Write The Docs Paris](https://www.meetup.com/Write-the-Docs-Paris/): La traduction de la + documentation de Python. + + +## Past + +- 2019-05-22: + [Paris.py #19](https://www.meetup.com/Paris-py-Python-Django-friends/events/260875730/): + Retours sur la PyCon US 2019. + [slides](https://julienpalard.frama.io/paris.py-19/) + +- 2018-12-18: + [Paris.py #16](https://www.meetup.com/Paris-py-Python-Django-friends/events/250063967/): + hackinscience.org: Comment on utilise Python pour enseigner Python. + [slides](https://mdk.fr/hackinscience/) + +- 2018-10-06: + [PyCon FR 2018](https://www.pycon.fr/2018/): + The emergence of consensus in the Python community. + [video](https://www.youtube.com/watch?v=Zb-LhOLEPg8) + +- 2018-01-14: + [Paris.py #14](https://www.meetup.com/Paris-py-Python-Django-friends/events/245495073/): + `async` et `await` sans asyncio. + [slides](https://mdk.fr/asyncio/) [video](https://www.youtube.com/watch?v=_LpJ7X8hY-Y) + +- 2017-04-06: + [Paris.py #13](https://www.meetup.com/Paris-py-Python-Django-friends/events/238318089/): + Traduction de la documentation de Python en français. + +- 2016-10-16: + [PyCon FR 2016](https://www.pycon.fr/2016/pages/programme.html#Traduction%20de%20la%20doc%20de%20Python%20et%20l'internationalisation): + La traduction de la documentation de Python et l'internationalisation. + [video](https://www.pycon.fr/2016/videos/traduction-de-la-doc-de-python-et-linternationalisation.html) \ No newline at end of file diff --git a/pelicanconf.py b/pelicanconf.py index e6175c0..198c68b 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals AUTHOR = "Julien Palard" SITENAME = "mdk.fr" -SITEURL = "https://mdk.fr" +SITEURL = "" PATH = "content" @@ -13,17 +13,11 @@ TIMEZONE = "Europe/Paris" DEFAULT_LANG = "fr" # Feed generation is usually not desired when developing -FEED_ALL_ATOM = "feeds/all.atom.xml" -CATEGORY_FEED_ATOM = "feeds/%s.atom.xml" +FEED_ALL_ATOM = None +CATEGORY_FEED_ATOM = None TRANSLATION_FEED_ATOM = None -AUTHOR_FEED_ATOM = "feeds/%s.atom.xml" -AUTHOR_FEED_RSS = "feeds/%s.rss.xml" - -# Blogroll -# LINKS = (('Pelican', 'http://getpelican.com/'), -# ('Python.org', 'http://python.org/'), -# ('Jinja2', 'http://jinja.pocoo.org/'), -# ('You can modify those links in your config file', '#'),) +AUTHOR_FEED_ATOM = None +AUTHOR_FEED_RSS = None # Social widget SOCIAL = ( diff --git a/publishconf.py b/publishconf.py index 674c0c5..7d65e60 100644 --- a/publishconf.py +++ b/publishconf.py @@ -7,18 +7,18 @@ from __future__ import unicode_literals import os import sys + sys.path.append(os.curdir) from pelicanconf import * -SITEURL = 'https://mdk.fr' +# If your site is available via HTTPS, make sure SITEURL begins with https:// +SITEURL = "https://mdk.fr" RELATIVE_URLS = False -FEED_ALL_ATOM = 'feeds/all.atom.xml' -CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml' +FEED_ALL_ATOM = "feeds/all.atom.xml" +CATEGORY_FEED_ATOM = "feeds/{slug}.atom.xml" + +AUTHOR_FEED_ATOM = "feeds/{slug}.atom.xml" +AUTHOR_FEED_RSS = "feeds/{slug}.rss.xml" DELETE_OUTPUT_DIRECTORY = True - -# Following items are often useful when publishing - -#DISQUS_SITENAME = "" -#GOOGLE_ANALYTICS = ""