import .drone.yml from master

.drone.yml

@@ -1,30 +1,101 @@
+---
 kind: pipeline
-name: Opytex 2020-2021
+name: Opytex Main
 type: docker
 
 trigger:
   branch:
-    - 2020-2021
+    - master
 
 steps:
-  - name: Deploy
+  - name: Build Opytex base
     image: python:3.8-alpine
+    volumes:
+      - name: pelican-output
+        path: /output
     commands:
-      - apk add --no-cache openssh-client ca-certificates bash rsync git imagemagick-dev imagemagick
+      - apk add --no-cache git imagemagick-dev imagemagick
       - git submodule init
       - git submodule update
-      - git clone https://git.opytex.org/lafrite/2020-2021.git content
       - pip install --no-cache-dir -r requirements.txt
       - export MAGICK_HOME=/usr
-      - pelican ./content/ -o output -s publishconf.py --relative-urls
+      - pelican ./content/ -o /output -s publishconf.py --relative-urls
-      - eval `ssh-agent -s`
+      - ls /output
-      - echo "$SSH_KEY" | ssh-add -
+
-      - mkdir -p ~/.ssh
+  - name: Push to bucket opytex.org
-      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+    image: plugins/s3
-      - ssh sshcontent@91.121.90.228 'mkdir -p ~/opytex.org/www/enseignements/2020-2021/'
+    volumes:
-      - rsync -rv --delete -e "ssh -p 22" ./output/ sshcontent@91.121.90.228:~/opytex.org/www/enseignements/2020-2021/ --checksum
+      - name: pelican-output
-    environment:
+        path: /output
-      SSH_KEY:
+    settings:
-        from_secret: sshcontent-key
+      bucket: opytex.org
+      endpoint: https://storage.opytex.org
+      access_key:
+        from_secret: minio_access_key
+      secret_key:
+        from_secret: minio_secret_key
+      source: /output/**/*
+      target: /
+      path_style: true
+      strip_prefix: /output
 
 
+volumes:
+  - name: pelican-output
+    temp: {}
+
+---
+kind: pipeline
+name: Opytex Year
+type: docker
+
+trigger:
+  branch:
+    - 2022-2023
+    - 2021-2022
+    - 2020-2021
+    - 2019-2020
+    - 2018-2019
+    - 2017-2018
+    - 2016-2017
+    - 2015-2016
+
+steps:
+  - name: Build Opytex ${DRONE_BRANCH}
+    image: python:3.8-alpine
+    volumes:
+      - name: pelican-output
+        path: /output
+    commands:
+      - apk add --no-cache git imagemagick-dev imagemagick
+      - git submodule init
+      - git submodule update
+      - git clone https://git.opytex.org/lafrite/${DRONE_BRANCH}.git content
+      - pip install --no-cache-dir -r requirements.txt
+      - apk add --no-cache git imagemagick-dev imagemagick
+      - pip install --no-cache-dir -r requirements.txt
+      - export MAGICK_HOME=/usr
+      - pelican ./content/ -o /output -s publishconf.py --relative-urls
+      - ls /output
+
+  - name: Push to bucket opytex.org
+    image: plugins/s3-sync:1
+    volumes:
+      - name: pelican-output
+        path: /drone/src/output
+    settings:
+      bucket: opytex.org
+      endpoint: https://storage.opytex.org
+      access_key:
+        from_secret: minio_access_key
+      secret_key:
+        from_secret: minio_secret_key
+      source: /output
+      target: /enseignements/${DRONE_BRANCH}
+      path_style: true
+      delete: true
+
+
+volumes:
+  - name: pelican-output
+    temp: {}

pelicanconf.py

@@ -9,7 +9,7 @@ from globalconf import *
 AUTHOR = 'Benjamin Bertrand'
 SITENAME = 'OpyTex'
 SITETITLE = 'OpyTex'
-SITESUBTITLE = "2020-2021"
+SITESUBTITLE = "2021-2022"
 SITEURL = ''
 
 CC_LICENSE_COMMERCIAL = True

publishconf.py

@@ -11,7 +11,7 @@ sys.path.append(os.curdir)
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = 'https://opytex.org/enseignements/2020-2021/'
+SITEURL = 'https://opytex.org/enseignements/2021-2022/'
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = 'feeds/all.atom.xml'

theme/templates/base.html

@@ -143,5 +143,6 @@
   </main>
 
   {% block additional_js %}{% endblock %}
+  <script type="text/javascript" async defer data-website-id="2cb9cd4c-66da-4e4f-9e84-a2d53c7b07bc" src="https://stat.opytex.org/umami.js"></script>
 </body>
 </html>