256.liw.fi, gtdfh.liw.fi, noir.liw.fi, seinfeld.liw.fi

1 files changed, 73 insertions, 78 deletions

diff --git a/ci-prod.ick b/ci-prod.ick
index dd91462..a2c35de 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -25,7 +25,9 @@ projects:
         - make
         - pandoc
         - pandoc-citeproc
+        - pcal
         - python3
+        - python3-yaml
         - texlive-fonts-recommended
         - texlive-latex-base
         - texlive-latex-recommended
@@ -150,6 +152,75 @@ projects:
           repo: ssh://git@git.liw.fi/obnam.org
     pipelines: *website_pipelines
 
+  - project: 256.liw.fi
+    parameters:
+      <<: *website_params
+      workspace_name: 256.liw.fi
+      rsync_src: html
+      rsync_target: ickliwfi@http.liw.fi:/srv/http/256.liw.fi
+      sources:
+        - name: pandoc-plugin
+          ref: master
+          location: ikiwiki-pandoc
+          repo: https://github.com/sciunto-org/ikiwiki-pandoc.git
+        - name: source
+          ref: main
+          location: src
+          repo: ssh://git@git.liw.fi/256.liw.fi
+    pipelines: *website_pipelines
+
+  - project: gtdfh.liw.fi
+    parameters:
+      <<: *website_params
+      workspace_name: gtdfh.liw.fi
+      rsync_src: html
+      rsync_target: ickliwfi@http.liw.fi:/srv/http/gtdfh.liw.fi
+      sources:
+        - name: pandoc-plugin
+          ref: master
+          location: ikiwiki-pandoc
+          repo: https://github.com/sciunto-org/ikiwiki-pandoc.git
+        - name: source
+          ref: main
+          location: src
+          repo: ssh://git@git.liw.fi/gtdfh.liw.fi
+    pipelines: *website_pipelines
+
+  - project: noir.liw.fi
+    parameters:
+      <<: *website_params
+      workspace_name: noir.liw.fi
+      rsync_target: ickliwfi@http.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: main
+          location: src
+          repo: git://git.liw.fi/noir.liw.fi
+    pipelines: *website_pipelines
+
+  - project: seinfeld.liw.fi
+    parameters:
+      <<: *website_params
+      workspace_name: seinfeld.liw.fi
+      rsync_target: ickliwfi@http.liw.fi:/srv/http/seinfeld.liw.fi
+      sources:
+        - name: source
+          ref: master
+          location: src
+          repo: ssh://git@git.liw.fi/seinfeld
+    pipelines:
+      - ick/setup_container
+      - ick/add_apt_signing_keys
+      - ick/add_apt_sources
+      - ick/restore_workspace
+      - ick/get_sources
+      - subplots
+      - ick/save_workspace
+
   - project: ideas.liw.fi
     parameters:
       <<: *website_params
@@ -223,7 +294,8 @@ pipelines:
           mkdir html
           cd src
           make
-          mv *.html *.pdf ../html
+          find . -maxdepth 1 -name '*.html' -o -name '*.pdf' |
+            while read file; do mv "$file" ../html; done
 
       - action: rsync
         where: host
@@ -231,83 +303,6 @@ pipelines:
 
 
 # 
-# - project: 256.liw.fi
-#   parameters:
-#     <<: *website_params
-#     workspace_name: 256.liw.fi
-#     rsync_src: html
-#     rsync_target: ickliwfi@ideas.liw.fi:/srv/http/256.liw.fi
-#     sources:
-#       - name: pandoc-plugin
-#         ref: master
-#         location: ikiwiki-pandoc
-#         repo: https://github.com/sciunto-org/ikiwiki-pandoc.git
-#       - name: source
-#         ref: main
-#         location: src
-#         repo: ssh://git@git.liw.fi/256.liw.fi
-#   pipelines:
-#     - ick/setup_container
-#     - ick/add_apt_signing_keys
-#     - ick/add_apt_sources
-#     - ick/restore_workspace
-#     - ick/get_sources
-#     - ikiwiki_subplot_incremental
-#     - ick/save_workspace
-# 
-# - project: gtdfh.liw.fi
-#   parameters:
-#     <<: *website_params
-#     workspace_name: gtdfh.liw.fi
-#     rsync_src: html
-#     rsync_target: ickliwfi@ideas.liw.fi:/srv/http/gtdfh.liw.fi
-#     sources:
-#       - name: pandoc-plugin
-#         ref: master
-#         location: ikiwiki-pandoc
-#         repo: https://github.com/sciunto-org/ikiwiki-pandoc.git
-#       - name: source
-#         ref: main
-#         location: src
-#         repo: ssh://git@git.liw.fi/gtdfh.liw.fi
-#   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: main
-#         location: src
-#         repo: git://git.liw.fi/noir.liw.fi
-#   pipelines: *website_pipelines
-# 
-# 
-# - project: seinfeld.liw.fi
-#   parameters:
-#     <<: *website_params
-#     workspace_name: seinfeld.liw.fi
-#     rsync_src: publish
-#     rsync_target: ickliwfi@ideas.liw.fi:/srv/http/seinfeld.liw.fi
-#     sources:
-#       - name: source
-#         ref: master
-#         location: src
-#         repo: ssh://git@git.liw.fi/seinfeld
-#   pipelines:
-#     - ick/setup_container
-#     - ick/add_apt_signing_keys
-#     - ick/add_apt_sources
-#     - ick/restore_workspace
-#     - ick/get_sources
-#     - run_make_and_publish_html
-# 
 # - project: vmdb2.liw.fi
 #   parameters:
 #     <<: *website_params