From 042a9a1152627a80a770fe63c47d72269028482b Mon Sep 17 00:00:00 2001
From: dumprop <34004367+dumprop@users.noreply.github.com>
Date: Sat, 23 Oct 2021 23:27:54 +0300
Subject: [PATCH] Fix and update seafile (#522)

* update seafile

* update memcached
---
 public/v4/apps/seafile-nomemcached.yml | 13 +++++++---
 public/v4/apps/seafile.yml             | 34 ++++++++++++++++++++------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/public/v4/apps/seafile-nomemcached.yml b/public/v4/apps/seafile-nomemcached.yml
index ed0f977..7123574 100644
--- a/public/v4/apps/seafile-nomemcached.yml
+++ b/public/v4/apps/seafile-nomemcached.yml
@@ -29,18 +29,19 @@ caproverOneClickApp:
     variables:
         - id: '$$cap_seafile_version'
           label: Seafile Version
-          defaultValue: '8.0.4'
+          defaultValue: '8.0.7'
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/seafileltd/seafile-mc/tags
           validRegex: '/.{1,}/'
         - id: '$$cap_mariadb_version'
           label: MariaDB Version
-          defaultValue: '10.6'
+          defaultValue: '10.6.4'
           description: Check out their Docker page for the valid tags https://hub.docker.com/_/mariadb?tab=tags
           validRegex: '/.{1,}/'
         - id: '$$cap_mariadb_root_pswd'
           label: MariaDB Root Password
-          defaultValue: '$$cap_gen_random_hex(32)'
+          defaultValue: '$$cap_gen_random_hex(10)'
           description: Default password for root user of MariaDB. Must have at least 8 chars, 1 letter and 1 number
+          validRegex: '/.{8,}/'
         - id: '$$cap_timezone'
           label: 'Seafile Timezone'
           defaultValue: 'Etc/UTC'
@@ -49,12 +50,16 @@ caproverOneClickApp:
           label: Seafile Admin Email
           description: Email for admin user of Seafile
           defaultValue: 'admin@seafile.com'
+          validRegex: '/.{1,}/'
         - id: '$$cap_admin_pswd'
           label: Seafile Admin Password
           description: Password for admin user of Seafile. Must have at least 8 chars, 1 letter and 1 number
+          defaultValue: '$$cap_gen_random_hex(10)'
+          validRegex: '/.{8,}/'
         - id: '$$cap_seafile_hostname'
           label: Seafile Hostname
           description: Hostname of Seafile instance (that will be used by it in future)
+          validRegex: '/.{3,}/'
 
     instructions:
         start: |-
@@ -67,7 +72,7 @@ caproverOneClickApp:
             Your app will soon be available at http://$$cap_appname.$$cap_root_domain/
 
             Don't forget to add specified hostname to Seafile domains!
-    displayName: Seafile (Official)
+    displayName: Seafile (no memcached)
     isOfficial: true
     description: Reliable and Performant File Sync and Share Solution
     documentation: Taken from https://manual.seafile.com/
diff --git a/public/v4/apps/seafile.yml b/public/v4/apps/seafile.yml
index 2eff950..fd961db 100644
--- a/public/v4/apps/seafile.yml
+++ b/public/v4/apps/seafile.yml
@@ -17,7 +17,7 @@ services:
             - seafile-net
         caproverExtra:
             notExposeAsWebApp: true
-    $$cap_appname-seafile:
+    $$cap_appname:
         image: 'seafileltd/seafile-mc:$$cap_seafile_version'
         volumes:
             - '$$cap_appname-seafile-data:/shared'
@@ -27,6 +27,7 @@ services:
             TIME_ZONE: $cap_timezone
             SEAFILE_ADMIN_EMAIL: $$cap_seafile_admin_email
             SEAFILE_ADMIN_PASSWORD: $$cap_seafile_admin_password
+            SEAFILE_SERVER_HOSTNAME: '$$cap_seafile_hostname'
         depends_on:
             $$cap_appname-db:
                 condition: service_healthy
@@ -38,25 +39,41 @@ caproverOneClickApp:
     variables:
         - id: $$cap_seafile_version
           label: Seafile Version
-          defaultValue: 8.0.4
+          defaultValue: 8.0.7
+          description: Check out their Docker page for the valid tags https://hub.docker.com/r/seafileltd/seafile-mc/tags
+          validRegex: '/.{1,}/'
         - id: $$cap_memcached_version
           label: Memcached Version
-          defaultValue: 1.5.6
+          defaultValue: 1.6.12
+          description: Check out their Docker page for the valid tags https://hub.docker.com/_/memcached?tab=tags
+          validRegex: '/.{1,}/'
         - id: $$cap_mariadb_version
           label: MariaDB Version
-          defaultValue: '10.5'
+          defaultValue: '10.6.4'
+          description: Check out their Docker page for the valid tags https://hub.docker.com/_/mariadb?tab=tags
+          validRegex: '/.{1,}/'
         - id: $$cap_mariadb_root_passwd
           label: MariaDB Root Password
-          defaultValue: zR5oZ2gN
+          defaultValue: '$$cap_gen_random_hex(10)'
+          description: Default password for root user of MariaDB. Must have at least 8 chars, 1 letter and 1 number
+          validRegex: '/.{8,}/'
         - id: $$cap_seafile_admin_email
           label: Seafile Admin Email
           defaultValue: admin@localhost
+          description: Email for admin user of Seafile
         - id: $$cap_seafile_admin_password
           label: Seafile Admin Password
-          defaultValue: xL2kX7iW
+          defaultValue: '$$cap_gen_random_hex(10)'
+          description: Password for admin user of Seafile. Must have at least 8 chars, 1 letter and 1 number
+          validRegex: '/.{8,}/'
         - id: $cap_timezone
           label: Seafile Time zone
-          defaultValue: Asia/Ho_Chi_Minh
+          defaultValue: 'Etc/UTC'
+          description: Timezone that Seafile should use
+        - id: '$$cap_seafile_hostname'
+          label: Seafile Hostname
+          description: Hostname of Seafile instance (that will be used by it in future)
+          validRegex: '/.{3,}/'
     instructions:
         start: >-
             Seafile is an open source cloud storage system with file encryption and
@@ -64,7 +81,8 @@ caproverOneClickApp:
         end: |-
             Seafile has been successfully deployed!
             App is available as http://$$cap_appname.$$cap_root_domain
-    displayName: Seafile
+            Don't forget to add specified hostname to Seafile domains!
+    displayName: Seafile (memcached)
     isOfficial: true
     description: >-
         Seafile is an open source cloud storage system with file encryption and