From b0049e9a050f418dcc229b0cc5b72ed237f4e74c Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 19 Oct 2019 21:06:42 +0300
Subject: Change: use new ikiwiki+pandoc+subplot pipeline for noir.liw.fi

---
 ci-prod-websites.ick | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/ci-prod-websites.ick b/ci-prod-websites.ick
index c1d26aa..c172a3d 100644
--- a/ci-prod-websites.ick
+++ b/ci-prod-websites.ick
@@ -75,6 +75,27 @@ projects:
         repo: ssh://git@git.liw.fi/private/liw/Journal
   pipelines: *website_pipelines
 
+- project: noir.liw.fi
+  parameters:
+    <<: *website_params
+    workspace_name: noir.liw.fi
+    rsync_target: ickliwfi@noir.liw.fi:/srv/http/noir.liw.fi
+    sources:
+      - name: pandoc-plugin
+        ref: master
+        location: ikiwiki-pandoc
+        repo: https://github.com/sciunto-org/ikiwiki-pandoc.git
+      - name: source
+        ref: master
+        location: src
+        repo: git://git.liw.fi/noir.liw.fi
+  pipelines: *website_pipelines
+    
+
+
+
+
+
 - project: ick.liw.fi
   parameters:
     <<: *ikiwiki_params
@@ -107,19 +128,6 @@ projects:
         location: src
         repo: git://git.liw.fi/vmdb2.liw.fi
   pipelines: *ikiwiki_pipelines
-    
-- project: noir.liw.fi
-  parameters:
-    <<: *ikiwiki_params
-    rsync_target: ickliwfi@noir.liw.fi:/srv/http/noir.liw.fi
-    sources:
-      - name: source
-        ref: master
-        location: src
-        repo: git://git.liw.fi/noir.liw.fi
-  pipelines: *ikiwiki_pipelines
-    
-
 
 - project: vmdb2-manual
   parameters:
@@ -151,7 +159,8 @@ pipelines:
           apt-get install -y subplot
 
           # "Install" the plugin so ikiwiki can find it
-          mkdir -p ikiwiki
+          find -ls
+          mkdir -p ikiwiki/IkiWiki/Plugin
           mv ikiwiki-pandoc/pandoc.pm ikiwiki/IkiWiki/Plugin
 
       - python: |
-- 
cgit v1.2.1