From 3475510b410de627be8eb335e4b0fe0db1c90f74 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Wed, 22 Sep 2021 00:37:54 +0000
Subject: [PATCH] Added collabora and jellyfin CT's

---
 CT-Build/Debian.Jenkinsfile |  2 +-
 CT-Build/Debian.yaml        | 51 +++++++++++++++++++++++++++++++++++++
 Readme.md                   | 16 ++++++++----
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/CT-Build/Debian.Jenkinsfile b/CT-Build/Debian.Jenkinsfile
index c8084a8..5fa6c9b 100644
--- a/CT-Build/Debian.Jenkinsfile
+++ b/CT-Build/Debian.Jenkinsfile
@@ -1,4 +1,4 @@
-String[] ImgVariantList = ['minimal', 'default', 'jenkinsbuilder', 'imgbuilder', 'jenkins', 'mysql' , 'pihole' ]
+String[] ImgVariantList = ['minimal', 'default', 'jenkinsbuilder', 'imgbuilder', 'jenkins', 'mysql' , 'pihole' , 'collabora' , 'jellyfin' ]
 
 pipeline {
     agent { label 'LXCBuilder' }
diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml
index 3f5fd73..f8a886c 100644
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -916,6 +916,8 @@ packages:
     variants:
     - jenkins
     - mysql
+    - collabora
+    - jellyfin
 
   #Https Repo pkgs    
   - packages:
@@ -924,6 +926,8 @@ packages:
     early: true
     variants:
     - jenkins
+    - collabora
+    - jellyfin
 
   #Minimal pkgs
   - packages:
@@ -1029,6 +1033,25 @@ packages:
     variants:
     - pihole
 
+#collabora pkgs    
+  - packages:
+    - loolwsd
+    - collaboraoffice*nl*
+    - collaboraoffice*dict-en*
+    - collaboraoffice*en-us*
+    - collaboraoffice*en-gb*
+    - code-brand
+    action: install
+    variants:
+    - collabora
+
+#jellyfin pkgs    
+  - packages:
+    - jellyfin
+    action: install
+    variants:
+    - jellyfin
+
   repositories:
   - name: sources.list
     url: |-
@@ -1048,6 +1071,18 @@ packages:
     variants:
     - mysql
 
+  - name: collabora.list
+    url: |-
+      deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg arch=amd64] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian11 ./
+    variants:
+    - collabora
+
+  - name: jellyfin.list
+    url: |-
+      deb [signed-by=/usr/share/keyrings/jellyfin-keyring.gpg] https://repo.jellyfin.org/debian {{ image.release }} main
+    variants:
+    - jellyfin
+
 actions:
 - trigger: post-unpack
   action: |-
@@ -1108,6 +1143,22 @@ actions:
   variants:
   - jenkins
 
+#Jellyfin Repo key
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    curl --retry 7 --retry-delay 5 -s https://repo.jellyfin.org/jellyfin_team.gpg.key  | gpg --dearmor >  /usr/share/keyrings/jellyfin-keyring.gpg
+  variants:
+  - jellyfin
+
+#collabora Repo key
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    curl --retry 7 --retry-delay 5 -L -s https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg -o /usr/share/keyrings/collaboraonline-release-keyring.gpg
+  variants:
+  - collabora
+
 #MySQL Repo key
 - trigger: post-unpack
   action: |-
diff --git a/Readme.md b/Readme.md
index 3512d03..560df3b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -23,6 +23,8 @@ This can be done on a Minimal debian CT (make sure to enable nesting) on the new
 | imgbuilder | Debian | LXC template builder node for Jenkins |
 | mysql | Debian | Mysql server with PhpMyadmin |
 | pihole | Debian | Pihole CT |
+| colabora | Debian | ColaboraOffice WebService (CODE version) |
+| jellyfin | Debian | Jellyfin in-home streaming server |
 | gitea | Alpine | Gitea server |
 | nginx | Alpine | Nginx server for reverse-proxy use |
 | ddns | Alpine | DDNS client configured for OVH/OVH-Cloud |
@@ -37,7 +39,7 @@ iSCSI
 
 Nextcloud
 
-JellyFin
+
 AptCacherNG
 NodeRed
 Omada
@@ -45,7 +47,7 @@ Unifi
 Docker
 
 
-Colabora
+
 MailBackup*
 FileShelter/transfer.sh
 WS(x2go-xfce)
@@ -74,11 +76,15 @@ Then select the created credential and click save
 7. Click 'Relaunch agent'
 8. Now you can build container images
 ## mysql
-1. To configure the MySQL root password in the container run the setup script `bash /opt/Setup/Scripts/FirstRun.sh`
+* To configure the MySQL root password in the container run the setup script `bash /opt/Setup/Scripts/FirstRun.sh`
 ## gitea 
 1. Edit the parameters in the FistRun script in the container  `vi /opt/Setup/Scripts/FirstRun.sh`
 2. Run the FistRun scipt in the container `ash /opt/Setup/Scripts/FirstRun.sh`
 # nginx
-1. Run the FistRun scipt in the container `ash /opt/Setup/Scripts/FirstRun.sh`
+* Run the FistRun scipt in the container `ash /opt/Setup/Scripts/FirstRun.sh`
 # pihole
-1. Run the FistRun scipt in the container `ash /opt/Setup/Scripts/FirstRun.sh`
\ No newline at end of file
+* Run the FistRun scipt in the container `ash /opt/Setup/Scripts/FirstRun.sh`
+# colabora
+* Update the configuration in /etc/loolwsd/loolwsd.xml and reload the service `systemctl restart loolwsd`
+# jellyfin 
+* To set-up the system follow the inital set-up wizard on http://<ip>:8096
\ No newline at end of file