From 43ce79016a1dd11798b2d58843f1c7fe43434288 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 10 May 2022 15:42:36 +0530
Subject: [PATCH 1/3] rainloop suggestion fixes

---
 .../RainLoop/Providers/Suggestions/OwnCloudSuggestions.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php b/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
index c27640b..f502914 100644
--- a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
+++ b/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
@@ -61,6 +61,11 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
 						break;
 					}
 
+					// Skip System users
+					if (isset($aContact['isLocalSystemBook']) && $aContact['isLocalSystemBook']) {
+						continue;
+					}
+
 					$sUid = empty($aContact['UID']) ? '' : $aContact['UID'];
 					if (!empty($sUid))
 					{
-- 
GitLab


From 5f24e2f385ec5a9a597f34810c7262f2c1776106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Tue, 10 May 2022 21:17:46 +0000
Subject: [PATCH 2/3] First attempt

---
 .gitlab-ci.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..3bb090c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,44 @@
+stages:
+    - deploy
+
+.deploy:nextcloud-app:
+    image: ubuntu:focal
+    stage: deploy
+    before_script: 
+      - mkdir $HOME/.ssh
+      - chmod 700 ~/.ssh
+      - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
+      - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
+      - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
+      - chmod 600 ~/.ssh/id_ed25519
+      - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
+      - apt-get update && apt-get install -y openssh-client rsync
+    script:
+    - echo "Deploying to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/rainloop && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/rainloop ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && rm -rf ${DEPLOYMENT_PATH}/data/rainloop-storage/_data_/_default_/cache/*"
+
+deploy:dev01:
+    extends: .deploy:nextcloud-app
+    when: manual
+    only:
+      - /^dev\/.*$/
+    environment:
+      name: dev/01
+      url: https://dev.eeo.one/
+    variables:
+      DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH
+      CONTAINER_NAME: dev01_nextcloud
+
+deploy:staging:
+  extends: .deploy:ecloud-launcher
+  when: manual
+  only:
+    - production
+    - ecloud-main
+  environment:
+    name: staging/01
+    url: https://eeo.one
+  variables:
+    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH
+    CONTAINER_NAME: nextcloud
+
-- 
GitLab


From 13b529e5549f35086ba64b97fe33afe566581acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Tue, 10 May 2022 21:19:05 +0000
Subject: [PATCH 3/3] Fix leftover

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bb090c..bc3d450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ deploy:dev01:
       CONTAINER_NAME: dev01_nextcloud
 
 deploy:staging:
-  extends: .deploy:ecloud-launcher
+  extends: .deploy:nextcloud-app
   when: manual
   only:
     - production
-- 
GitLab