From f25e9a68d91a14fc5d7100bef6ad31544d141b02 Mon Sep 17 00:00:00 2001
From: Vincent Mazenod <vmazenod@gmail.com>
Date: Sat, 1 Dec 2018 00:11:16 +0100
Subject: [PATCH] enhance deployment

---
 .gitlab-ci.yml   |  1 +
 README.md        | 29 ++++++++++++-----------------
 bin/activate     |  6 ++++++
 bin/local        | 17 +++++++++++++++++
 bin/setup        | 15 +++++++++++++++
 bin/start        |  3 +++
 requirements.txt |  2 +-
 7 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100755 bin/activate
 create mode 100755 bin/local
 create mode 100755 bin/setup
 create mode 100755 bin/start

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87baabf..5961a8c 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/README.md b/README.md
index c5dd84a..e8463e4 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,28 @@
+# 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)
diff --git a/bin/activate b/bin/activate
new file mode 100755
index 0000000..ce46bf3
--- /dev/null
+++ b/bin/activate
@@ -0,0 +1,6 @@
+#!/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
diff --git a/bin/local b/bin/local
new file mode 100755
index 0000000..83dd5a4
--- /dev/null
+++ b/bin/local
@@ -0,0 +1,17 @@
+#!/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
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 0000000..f55ca2a
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,15 @@
+#!/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
diff --git a/bin/start b/bin/start
new file mode 100755
index 0000000..28fb791
--- /dev/null
+++ b/bin/start
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash develop_server.sh start
diff --git a/requirements.txt b/requirements.txt
index 20d6784..bb57e44 100644
--- a/requirements.txt
+++ b/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
-- 
GitLab