enhance deployment

.gitlab-ci.yml

@@ -36,3 +36,4 @@ deploy:
   script:
     - apt-get install -y --force-yes rsync
     - rsync -az --exclude '_' -e ssh output/ $USERNAME@$HOST:~/public_html/
+  when: manual

README.md

+# Blog LIMOS de Vincent Mazenod
 
-## Installer les dépendances
-
-```bash
-virtualenv -p /usr/bin/python3 .venv
-source .venv/bin/activate
-pip install -r requirements.txt
-git submodule init
-git submodule update --recursive --remote
+```
+./bin/setup
+source bin/activate
+./bin/start
 ```
 
 ## Lancer le serveur de prévisualisation
 
-```bash
+```
 bash develop_server.sh start
 ```
 
+* http://0.0.0.0:8000/
+
 ## faire tourner les slides en local
 
-```bash
-cd content && npm install
 ```
-
-```bash
-<VirtualHost *:80>
-   DocumentRoot "/opt/lampp/htdocs/limos/content"
-  ServerName slides
-</VirtualHost>
+./bin/local
 ```
 
+* http://slides/slides/
+
+
 ## see also
 
 * [https://limos.isima.fr/~mazenod/blog-et-pages-perso-au-limos.html](https://limos.isima.fr/~mazenod/blog-et-pages-perso-au-limos.html)

bin/activate

+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]:-$0}" )/.." && pwd )"
+if [[ -z "$VIRTUAL_ENV" ]] || [[ "$VIRTUAL_ENV" != "${DIR}/.venv" ]] ; then
+    source "${DIR}/.venv/bin/activate"
+fi

bin/local

+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]:-$0}" )/.." && pwd )"
+
+if [[ ! -f "/etc/apache2/sites-available/slides.conf" ]] ; then
+
+  (
+  echo "<VirtualHost *:80>"
+  echo "DocumentRoot /var/www/html/blog/blog.limos.fr/content/"
+  echo "ServerName slides"
+  echo "</VirtualHost>"
+  ) | sudo tee -a /etc/apache2/sites-available/slides.conf
+
+  sudo a2ensite slides
+
+  echo "127.0.0.1   slides" | sudo tee -a /etc/hosts
+fi

bin/setup

+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]:-$0}" )/.." && pwd )"
+
+if [[ ! -d "${DIR}/.venv" ]] ; then
+  virtualenv -p /usr/bin/python3 "${DIR}/.venv"
+fi
+
+source "${DIR}/.venv/bin/activate"
+pip install -r requirements.txt
+
+git submodule init
+git submodule update --recursive --remote
+
+cd content && npm install

bin/start

+#!/usr/bin/env bash
+
+bash develop_server.sh start

requirements.txt

@@ -5,7 +5,7 @@ docutils==0.13.1
 feedgenerator==1.9
 Jinja2==2.9.5
 lxml==3.7.3
-Markdown==2.6.8
+Markdown
 MarkupSafe==0.23
 packaging==16.8
 pelican==3.7.1