Merge pull request #44 from YunoHost-Apps/testing

Testing

README.md

@@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc.
 
-**Shipped version:** 11.9.8
+**Shipped version:** 11.10.1
 
 ## Screenshots
 
@@ -18,7 +18,9 @@ GitLab is a web-based Git-repository manager providing wiki, issue-tracking and
 
 ## Configuration
 
-How to configure this app: by an admin panel
+How to configure this app: 
+- An admin panel
+- The file: `/etc/gitlab/gitlab-persistent.rb` (use `sudo gitlab-ctl reconfigure` after any modification of this file)
 
 ## Documentation
 

conf/gitlab.rb

@@ -2031,3 +2031,5 @@ nginx['listen_https'] = false
 #     handler: 'failover_pgbouncer'
 #   }
 # }
+
+from_file '/etc/gitlab/gitlab-persistent.rb'

manifest.json

@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "11.9.8~ynh1",
+    "version": "11.10.1~ynh1",
     "description": {
         "en": "GitLab is a Git-repository manager.",
         "fr": "GitLab est un gestionnaire de dépôts Git."

scripts/backup

@@ -62,6 +62,7 @@ ynh_print_info "Backuping configuration files of Gitlab..."
 
 ynh_backup "$config_path/gitlab-secrets.json"
 ynh_backup "$config_path/gitlab.rb"
+ynh_backup "$config_path/gitlab-persistent.rb"
 
 #=================================================
 # END OF SCRIPT

scripts/install

@@ -122,6 +122,9 @@ ynh_print_info "Preconfigure gitlab..."
 
 mkdir -p $config_path
 
+touch "$config_path/gitlab-persistent.rb"
+chown admin: "$config_path/gitlab-persistent.rb"
+
 cp -f ../conf/gitlab.rb "$config_path/gitlab.rb"
 ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
 

scripts/restore

@@ -68,6 +68,7 @@ ynh_print_info "Restoring configuration files of Gitlab..."
 
 ynh_restore_file "$config_path/gitlab-secrets.json"
 ynh_restore_file "$config_path/gitlab.rb"
+ynh_restore_file "$config_path/gitlab-persistent.rb"
 
 #=================================================
 # RESTORE THE APP MAIN DIR

scripts/upgrade

@@ -207,6 +207,9 @@ then
 	ynh_store_file_checksum "$config_path/gitlab.rb"
 fi
 
+touch "$config_path/gitlab-persistent.rb"
+chown admin: "$config_path/gitlab-persistent.rb"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================

scripts/upgrade.d/upgrade.11.9.8.sh

@@ -0,0 +1,7 @@
+gitlab_version="11.9.8"
+
+gitlab_x86_64_source_sha256="bb81616deeb92a4abf129373a4e6c9d246b37ad1ea707328efeec2fc0a07fc2a"
+
+gitlab_arm_source_sha256="1810be6f6780a700624343b976eace277ac6aefce51ec4341f549f7642be620f"
+
+gitlab_filename="gitlab-ce-${gitlab_version}.deb"

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
-gitlab_version="11.9.8"
+gitlab_version="11.10.1"
 
-gitlab_x86_64_source_sha256="bb81616deeb92a4abf129373a4e6c9d246b37ad1ea707328efeec2fc0a07fc2a"
+gitlab_x86_64_source_sha256="cffde1c3875c2864c3e954dd1077acde3cc87d8f8963309d2ac4455d621748eb"
 
-gitlab_arm_source_sha256="1810be6f6780a700624343b976eace277ac6aefce51ec4341f549f7642be620f"
+gitlab_arm_source_sha256="f414dbfaa074843c0f693e8d5cd63d6fd913c7a39358ebcb55f5be664aaf5916"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"