added apollolake (DS918+) support

2025-08-15 21:24:38 +00:00 · 2018-01-27 02:04:44 +01:00
parent 1ef7542d81
commit cdf52769f9
92 changed files with 61 additions and 1607 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,17 @@
+# Drupal editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.json]
+indent_size = 4
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
-.idea
+.idea
+*.spk
+build
+docker
+source
--- a/README.md
+++ b/README.md
@ -1,141 +1,48 @@
-## Update GitLab 10.3:
-I am facing several Problem during the update, but iam stil working on.
- The package structure of the original package "Docker-GitLab-9.4.4-0050" chnaged dramatically.
- MariaDB 10 has some issuees with Gitlab 10.3 (the db migration script breaks the instalation - bug reported)
-
-Because of the heavy changes a complete data migration is required, i'am bulding a script to make it easy.
-
-## Update GitLab 10.3 Announcements:
- All-In-One (AIO) Packages will be available soon (complete no download on the fly required)
- Backup/Restore Script will be available soon
- New package namespace (new Gitlab icons will be displayed correctly)
- Support for packages < 10.0 will be discontinued
-
 ## synology-gitlab
-Updated an improved Original Synology Package from 
-https://www.synology.com/de-de/dsm/app_packages/Docker-GitLab

-## Packages used:  
-The following docker images will be downloaded during the installation. **_This will take some time so please be ptaient_**.
+This is an upgraded and improved GitLab package which uses the stock Synology Package from [Synology Repo](https://www.synology.com/de-de/dsm/packages/Docker-GitLab). 

-sameersbn/gitlab:10.x.x (about 620MB) https://hub.docker.com/r/sameersbn/gitlab/   
-sameersbn/redis:latest (about 66MB)  https://hub.docker.com/r/sameersbn/redis/  
-
-## Supported Architectures
-Since i can't test all architectures i had to make a choice which i can cover or which i expect to work. If your architecture is not in 
-this list so please feel free to contact me and we can give it a try.
+**Download latest SPK**: [here](https://github.com/jboxberger/synology-gitlab/releases)  
 
-For now this package should work on this architectures: x86 avoton bromolow cedarview braswell kvmx64 broadwell
+## Supported Architectures
+**x86 avoton bromolow cedarview braswell kvmx64 broadwell apollolake** 
+Since i can't test all architectures i had to make a choice which i can cover or which i expect to work. If your architecture is not in this list so please feel free to contact me and we can give it a try.  

-You can check the architecture of your device here: https://www.synology.com/de-de/dsm/packages/Docker-GitLab
+You can check the architecture of your device here: https://github.com/SynoCommunity/spksrc/wiki/Architecture-per-Synology-model 
+or here https://www.synology.com/en-us/knowledgebase/DSM/tutorial/General/What_kind_of_CPU_does_my_NAS_have

 # Updates
-**_Please be patient during the Update process_**. Updates may take several minutes because the 
-new docker Image needs to be downloaded from the docker-hub. Depending on your internet connection 
-the **download of approximate 620MB** can take some time. The first docker container boot up - after 
-installation/update - takes some minutes because GitLab needs to migrate tha Database first, you 
-can see the status in the GitLab container log (DSM docker backend). The Update is complete when 
-the CPU begins to idle.    
+**_Please be patient during the Update process_**. The first docker container boot up - after 
+installation/update - takes some minutes because GitLab needs to migrate tha Database first, you can see the 
+status in the GitLab container log (DSM docker backend). The Update is complete when the CPU begins to idle.    
+ 
+#### DSM 6.1.1-15101 
+| Package Type  | Prev. Version | New Version | Status             |
+|---------------|---------------|-------------|--------------------|
+| Stock         | 8.17.4-0022   | 10.1.4      | incompatible       |
+| Stock         | 9.4.4-0024    | 10.1.4      | ok                 |
+| Stock         | 9.4.4-0050    | 10.1.4      | ok                 |
+| Old           | 9.5.2         | 10.1.4      | ok                 |
+| Old           | 10.0.2        | 10.1.4      | ok                 |
+| Old           | 10.1.1        | 10.1.4      | ok                 |
+| New           | 10.1.4        | 10.2.2      | ok                 |
+| New           | 10.2.2        | 10.2.5      | ok                 |

- **2017-10-04** - sameersbn/gitlab:10.1.1 (664.4MB)
- **2017-10-04** - sameersbn/gitlab:10.0.2 (623.1MB)
- **2017-09-03** - sameersbn/gitlab:9.5.2  (619.6MB)
- **2017-08-14** - sameersbn/gitlab:9.4.4  (531.1MB)
- **2017-07-15** - sameersbn/gitlab:9.3.5  (521.9MB)
- **2017-05-31** - sameersbn/gitlab:9.2.2  (486.4MB)
- **2017-04-30** - sameersbn/gitlab:9.1.1  (445.4MB)
- **2017-03-27** - sameersbn/gitlab:9.0.0  (390.5MB)
- **2017-03-05** - sameersbn/gitlab:8.16.6 (305.1MB)
- **2017-02-05** - sameersbn/gitlab:8.16.3 (303.3MB)
- **2017-01-25** - sameersbn/gitlab:8.15.4 (314.8MB)
- **2017-01-08** - sameersbn/gitlab:8.15.2 (298.3MB)
- **2016-12-03** - sameersbn/gitlab:8.14.1 (313.9MB)
- **2016-11-17** - sameersbn/gitlab:8.13.5 (308.7MB)
- **2016-10-30** - sameersbn/gitlab:8.13.1 (308.6MB)
- **2016-10-16** - sameersbn/gitlab:8.12.6 (307.5MB) - docker settings now enabled
- **2016-10-04** - sameersbn/gitlab:8.12.3 (308.9MB)
- **2016-09-19** - sameersbn/gitlab:8.11.6 (303.1MB)
- **2016-08-25** - sameersbn/gitlab:8.11.2 (303.0MB)
- **2016-08-25** - sameersbn/gitlab:8.11.0 (302.3MB)
- **2016-07-24** - sameersbn/gitlab:8.10.0 (293.0MB)  
- **2016-07-09** - sameersbn/gitlab:8.9.5 (287.1MB)  
- **2016-06-25** - sameersbn/gitlab:8.9.0 (284.6MB)  
- **2016-06-03** - sameersbn/gitlab:8.8.3 (290.5MB)  
- **2016-05-16** - sameersbn/gitlab:8.7.5 (279.7MB)  
- **2016-05-06** - sameersbn/gitlab:8.7.2 (279.5MB)  
- **2016-05-01** - sameersbn/gitlab:8.7.0 (274.2MB)  
- **2016-03-29** - sameersbn/gitlab:8.6.1 (270.0MB)  
- **2016-03-19** - sameersbn/gitlab:8.5.8 (268.6MB)  
- **2016-03-01** - sameersbn/gitlab:8.5.1 (268.2MB)  
- **2016-02-04** - sameersbn/gitlab:8.4.3 (267.7MB)
- **2016-01-24** - sameersbn/gitlab:8.4.0 (267.7MB)
- **2015-12-31** - sameersbn/gitlab:8.3.2 (254.3MB)
- **2015-12-14** - sameersbn/gitlab:8.2.3 (250.9MB)
+#### DSM 6.1.4-15217 
+| Package Type  | Prev. Version | New Version | Status             |
+|---------------|---------------|-------------|--------------------|
+| Stock         | 8.17.4-0022   | 10.1.4      | incompatible       |
+| Stock         | 9.4.4-0024    | 10.1.4      | ok                 |
+| Stock         | 9.4.4-0050    | 10.1.4      | ok                 |
+| Old           | 9.5.2         | 10.1.4      | ok                 |
+| Old           | 10.0.2        | 10.1.4      | ok                 |
+| Old           | 10.1.1        | 10.1.4      | ok                 |
+| New           | 10.1.4        | 10.2.2      | ok                 |
+| New           | 10.2.2        | 10.2.5      | ok                 |
+| New           | 10.2.5        | 10.3.x      | DB Migrate fail    |

-# Known Problems
- DSM 6.1 takes the old Gitlab icon from the original package instead the updated icon from from my package.
- DSM 6.0-7321 breaks the docker container. You can fix it by reinstalling the synology-gitlab package (without changing any settings)
- When you have troubles updating, update again an re-enter the gitlab database credentials.
- If you have trouble removing old images you can try this. Fist stop all useless images. Then login with ssh as root 
-  on your synology and enter this command
-  
-  docker rmi $(docker images -q --filter dangling=true)
-  
-  If the old images are gone you can reinstall the synology package and everything should work fine. If it doesn't
-  help, you can uninstall the synology package (keeping all your data) and reinstall the package again (please don't
-  forget to save your database credentials first). 
- On a new Gitlab (DB) Install, for unknown reasons the gitlab install routine stops with an error and fails to add 
-  the default 'root' user. 
-  ```
-  /home/git/gitlab/lib/tasks/gitlab/setup.rake:17:in `setup_db'
-  /home/git/gitlab/lib/tasks/gitlab/setup.rake:4:in `block (2 levels) in &lt;top (required)&gt;'
-  Tasks: TOP =&gt; db:schema:load
-  (See full trace by running task with --trace)
-  ```
-  
-  You can login to your database and insert the user manually with this query:
-  ```sql
-    INSERT into gitlab.users (id, email, encrypted_password, name, admin, authentication_token, username, state, notification_email, confirmation_token, confirmed_at, password_expires_at, created_at ) VALUES (
-        1,																	
-        'root@gitlab.com',													
-        '$2a$10$tZ0VSv4BpRut2sXQVjJskO/VAX539vqeBEQJ1yc0nc9H0xsGMc/42',		
-        'root',																
-        1,																	
-        'hZ2R2V791aKYNu34DEGJ',												
-        'root',																 
-        'active',															
-        'root@gitlab.com', 													
-        'Wt1matyrmTsdvc7LJk2E',                                         	
-        '2015-12-29 15:55:16',                                          	
-        '2015-01-01 01:00:00',                                              
-        '2015-01-01 01:00:00'												
-    );
-  ```
-  
-  Now you can login with the default credentials 'root' / '5iveL!fe'. I highly recommend to add a new user and delete this "dummy" user
-  because of the public authentication_token.
-  
-# HowTo's
-
-## Backup all my Gitlab data
-First go to the Packet Manager in your DSM and stop the Gitlab Package.
-
-**1) Save your GitLab Credentials**
- go to Docker App in you DSM
- Select Container
- choose your synology_gitlab container
- click settings button (above) and export your settings, alternatively you can click on Details and backup your environment variables by hand  
- the **most important** variables are GITLAB_SECRETS_DB_KEY_BASE, GITLAB_SECRETS_SECRET_KEY_BASE, Database Credentials to get the DB Dump  
-
-**2) Save Database**
- login via ssh 
- complete the following command from your settings you saved before in the first step
-
-  ```markdown
-    mysqldump -h localhost -u <DB_USER> -p"<DB_PASS>" <DB_NAME> > /volume1/anyfolder/gitlab_database_dump.sql
-  ```
-
-**3) Save Data**
- backup folder /volume1/docker/gitlab
-
-Now you should be save and be able to restore your whole installation even if something went really wrong.
+```
+Stock: Package directly installed from Synology		
+Old: Old modified Gitlab Package up to v10.1.1		
+New: New modified Gitlab Package from v10.1.4		
+```
--- a/latest.spk
+++ b/latest.spk
--- a/src/GitLab/INFO
+++ b/src/GitLab/INFO
@ -1,52 +0,0 @@
-package="Docker-GitLab"
-version="10.1.1"
-maintainer="Juri Boxberger"
-arch="x86 avoton bromolow cedarview braswell kvmx64 broadwell apollolake"
-firmware="5.2-5545"
-support_center="no"
-install_dep_packages="Docker>=1.6.2-0035:MariaDB"
-thirdparty="yes"
-description_chs="GitLab 是基于网页的 Git 知识库管理器，带维基和问题跟踪功能。它有大量的功能并可通过 Docker 在 Synology NAS 上运行。"
-description_cht="GitLab 是一款網頁介面的 Git 存放庫管理程式，具備 wiki 及問題追蹤功能，功能豐富，可透過 Docker 於 Synology NAS 上執行。"
-description_csy="GitLab je webový správce úložiště Git s funkcemi wiki a sledování problémů. Obsahuje celou řadu funkcí a lze jej spustit na zařízení Synology NAS prostřednictvím dockeru."
-description_dan="GitLab er en webbaseret Git-informationsbasestyring med wiki og problemsporingsfunktioner. Det indeholder mange funktioner og kan køres på Synology NAS via Docker."
-description_enu="GitLab is a web-based Git repository manager with wiki and issue tracking features. It has numerous features and can be run on Synology NAS via Docker."
-description="GitLab is a web-based Git repository manager with wiki and issue tracking features. It has numerous features and can be run on Synology NAS via Docker."
-description_fre="GitLab est un gestionnaire Web de référentiel Git avec wiki et doté de fonctions de suivi de problème. Il possède de nombreuses fonctions et peut s'exécuter sur un Synology NAS via Docker."
-description_ger="GitLab ist ein webbasierter Git-Repositorymanager mit Wiki- und Issue-Tracking-Funktionen. Das Programm verfügt über zahlreiche Funktionen und kann über Docker auf dem Synology NAS ausgeführt werden."
-description_hun="A GitLab egy webalapú Git tárházkezelő, mely wikivel és problémakövetési funkciókkal is rendelkezik. Ez a számos különböző szolgáltatást nyújtó alkalmazás a Dockeren keresztül futtatható a Synology NAS kiszolgálón."
-description_ita="GitLab è un manager repository Git basato su Web con funzioni di monitoraggio errori e wiki. Presenta numerose funzioni e può essere eseguito su Synology NAS via Docker."
-description_jpn="GitLab は、wiki や問題追跡機能を備えたウェブベースの Git レポジトリ マネージャです。これにはさまざまな機能があり、ドッカーを介して Synology NAS を起動することができます。"
-description_krn="GitLab은 wiki 및 문제 추적 기능을 가진 Git 리포지토리 관리자입니다. 이는 다양한 기능을 제공하며 Docker를 통해 Synology NAS에서 실행될 수 있습니다."
-description_nld="GitLab is een webgebaseerde Git-opslagplaats met wiki- en actietrackingfuncties. Het biedt talrijke functies kan via Docker op Synology NAS worden gedraaid."
-description_nor="GitLab er en nettbasert Git-arkivadministrator med wiki og funksjoner for problemsporing. Den har flerfoldige funksjoner og kan kjøres på Synology NAS via Docker."
-description_plk="GitLab to sieciowy menedżer repozytorium Git wyposażonym w wiki i funkcje śledzenia błędów. Zawiera wiele funkcji, które mogą być uruchomione na Synology NAS poprzez aplikację Docker."
-description_ptb="O GitLab é um gerenciador de repositório Git baseado na web com recursos de rastreamento de problemas e wiki. Ele tem vários recursos e pode ser executado no Synology NAS via Docker."
-description_ptg="GitLab é um gestor de repositórios Git, com funcionalidades wiki e acompanhamento de problemas.Possui inúmeras funcionalidades e pode ser executado no Synology NAS através do Docker."
-description_rus="GitLab — это веб-средство управления репозиторием Git с функциональностью вики и отслеживания неисправностей. Средство имеет множество функций и может запускаться на Synology NAS с помощью Docker."
-description_spn="GitLab es un gestor de repositorio Git basado en web con funciones de seguimiento de problemas y wiki. Cuenta con numerosas funciones y puede ejecutarse en Synology NAS a través de Docker."
-description_sve="GitLab är en webbaserad hanterare för Git-dokumentsamlingar med funktioner för wiki och problemspårning. Den har talrika funktioner och kan köras på Synology NAS via Docker."
-description_trk="GitLab, wiki ve yayın izleme özelliklerine sahip bir web tabanlı Git deposu yöneticisidir. Çok sayıda özelliği vardır ve Synology NAS üzerinde Docker yoluyla çalıştırılabilir."
-displayname_chs="GitLab"
-displayname_cht="GitLab"
-displayname_csy="GitLab"
-displayname_dan="GitLab"
-displayname_enu="GitLab"
-displayname="GitLab"
-displayname_fre="GitLab"
-displayname_ger="GitLab"
-displayname_hun="GitLab"
-displayname_ita="GitLab"
-displayname_jpn="GitLab"
-displayname_krn="GitLab"
-displayname_nld="GitLab"
-displayname_nor="GitLab"
-displayname_plk="GitLab"
-displayname_ptb="GitLab"
-displayname_ptg="GitLab"
-displayname_rus="GitLab"
-displayname_spn="GitLab"
-displayname_sve="GitLab"
-displayname_trk="GitLab"
-offline_install="yes"
-extractsize="290"
--- a/src/GitLab/PACKAGE_ICON.PNG
+++ b/src/GitLab/PACKAGE_ICON.PNG
--- a/src/GitLab/PACKAGE_ICON_256.PNG
+++ b/src/GitLab/PACKAGE_ICON_256.PNG
--- a/src/GitLab/WIZARD_UIFILES/install_uifile
+++ b/src/GitLab/WIZARD_UIFILES/install_uifile
@ -1 +0,0 @@
-install_uifile_enu
--- a/src/GitLab/WIZARD_UIFILES/install_uifile_enu
+++ b/src/GitLab/WIZARD_UIFILES/install_uifile_enu
@ -1,181 +0,0 @@
-[{
-	"step_title": "GitLab Configuration",
-	"items": [{
-		"desc": "Create a shared folder to store the data of GitLab.",
-		"subitems": [{
-			"defaultValue": "gitlab",
-			"desc": "Shared folder name",
-			"key": "pkgwizard_dataroot",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the GitLab administrator email account.",
-		"subitems": [{
-			"defaultValue": "example@example.com",
-			"desc": "E-Mail",
-			"key": "pkgwizard_admin_email",
-			"validator": {
-				"allowBlank": false,
-				"vtype": "email"
-			}
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "GitLab Configuration",
-	"items": [	{
-		"desc": "Please enter the full domain name for GitLab.",
-		"subitems": [{
-			"defaultValue": "localhost",
-			"desc": "Domain name",
-			"key": "pkgwizard_hostname",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the HTTP port number for GitLab.",
-		"subitems": [{
-			"defaultValue": "30000",
-			"desc": "HTTP port number",
-			"key": "pkgwizard_http_port",
-			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[1-9]\\d{0,4}$/"
-				}
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the SSH port number for GitLab.",
-		"subitems": [{
-			"defaultValue": "30001",
-			"desc": "SSH port number",
-			"key": "pkgwizard_ssh_port",
-			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[1-9]\\d{0,4}$/"
-				}
-			}
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "Database Configuration",
-	"items": [{
-		"desc": "Enter your MariaDB root password if user and database not exists.",
-		"subitems": [{
-			"desc": "Root password",
-			"key": "pkgwizard_mysql_password"
-		}],
-		"type": "password"
-	},
-	{
-		"desc": "Gitlab Database & User",
-		"subitems": [{
-			"desc": "Database name",
-			"defaultValue": "gitlab",
-			"key": "pkgwizard_db_name",
-			"validator": {
-				"allowBlank": false
-			}
-		},
-		{
-			"desc": "Username",
-			"defaultValue": "gitlab",
-			"key": "pkgwizard_db_user",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-	    "desc": " ",
-		"subitems": [{
-			"desc": "Password",
-			"key": "pkgwizard_db_password",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "password"
-	}]
-},
-{
-	"step_title": "GitLab Email Configuration",
-	"items": [{
-		"desc": "Enable GitLab to send emails through a SMTP server.",
-		"subitems": [{
-			"defaultValue": false,
-			"desc": "Enable SMTP",
-			"key": "pkgwizard_smtp_enable"
-		}],
-		"type": "multiselect"
-	},
-	{
-		"desc": "Please enter the SMTP server address hosting GitLab.",
-		"subitems": [{
-			"desc": "SMTP address",
-			"key": "pkgwizard_smtp_address"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the SMTP server port.",
-		"subitems": [{
-			"defaultValue": "587",
-			"desc": "SMTP port",
-			"key": "pkgwizard_smtp_port",
-			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[1-9]\\d{0,4}$/"
-				}
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the SMTP server username.",
-		"subitems": [{
-			"desc": "SMTP username",
-			"key": "pkgwizard_smtp_user"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the SMTP server password.",
-		"subitems": [{
-			"desc": "SMTP password",
-			"key": "pkgwizard_smtp_pass"
-		}],
-		"type": "password"
-	},
-	{
-		"desc": "When GitLab is connected, verify the SMTP server's SSL certificate.",
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Verify the SSL certificate and refuse unsafe connections.",
-			"key": "pkgwizard_smtp_verify"
-		}],
-		"type": "multiselect"
-	}]
-},
-{
-	"step_title": "GitLab Info",
-	"items": [{
-		"desc": "The default login credential is root/5iveL!fe"
-	}]
-}]
--- a/src/GitLab/WIZARD_UIFILES/install_uifile_ger
+++ b/src/GitLab/WIZARD_UIFILES/install_uifile_ger
@ -1,181 +0,0 @@
-[{
-	"step_title": "GitLab Konfiguration",
-	"items": [{
-		"desc": "Erstellen Sie einen gemeinsamen Ordner zum Speichern der Daten von GitLab.",
-		"subitems": [{
-			"defaultValue": "gitlab",
-			"desc": "Name des Ordners",
-			"key": "pkgwizard_dataroot",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie das E-Mail-Konto des GitLab-Administrators ein.",
-		"subitems": [{
-			"defaultValue": "example@example.com",
-			"desc": "E-Mail",
-			"key": "pkgwizard_admin_email",
-			"validator": {
-				"allowBlank": false,
-				"vtype": "email"
-			}
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "GitLab Konfiguration",
-	"items": [	{
-		"desc": "Geben Sie den vollständigen Domainnamen für GitLab ein.",
-		"subitems": [{
-			"defaultValue": "localhost",
-			"desc": "Domainname",
-			"key": "pkgwizard_hostname",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie die HTTP-Portnummer für GitLab ein.",
-		"subitems": [{
-			"defaultValue": "30000",
-			"desc": "HTTP-Portnummer",
-			"key": "pkgwizard_http_port",
-			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[1-9]\\d{0,4}$/"
-				}
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie die SSH-Portnummer für GitLab ein.",
-		"subitems": [{
-			"defaultValue": "30001",
-			"desc": "SSH-Portnummer",
-			"key": "pkgwizard_ssh_port",
-			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[1-9]\\d{0,4}$/"
-				}
-			}
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "Datenbank Konfiguration",
-	"items": [{
-		"desc": "Geben Sie Ihr Root-Kennwort für MariaDB ein wenn Benutzer und Datenbank noch nicht existieren.",
-		"subitems": [{
-			"desc": "Root-Kennwort",
-			"key": "pkgwizard_mysql_password"
-		}],
-		"type": "password"
-	},
-	{
-		"desc": "Gitlab Datenbank & Benutzer",
-		"subitems": [{
-			"desc": "Datenbankname",
-			"defaultValue": "gitlab",
-			"key": "pkgwizard_db_name",
-			"validator": {
-				"allowBlank": false
-			}
-		},
-		{
-			"desc": "Benutzer",
-			"defaultValue": "gitlab",
-			"key": "pkgwizard_db_user",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-	    "desc": " ",
-		"subitems": [{
-			"desc": "Passwort",
-			"key": "pkgwizard_db_password",
-			"validator": {
-				"allowBlank": false
-			}
-		}],
-		"type": "password"
-	}]
-},
-{
-	"step_title": "GitLab Email Konfiguration",
-	"items": [{
-		"desc": "Aktivieren Sie GitLab, um E-Mails über einen SMTP-Server zu senden.",
-		"subitems": [{
-			"defaultValue": false,
-			"desc": "SMTP aktivieren",
-			"key": "pkgwizard_smtp_enable"
-		}],
-		"type": "multiselect"
-	},
-	{
-		"desc": "Geben Sie die SMTP-Serveradresse von GitLab ein.",
-		"subitems": [{
-			"desc": "SMTP-Adresse",
-			"key": "pkgwizard_smtp_address"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie den SMTP-Serverport ein.",
-		"subitems": [{
-			"defaultValue": "587",
-			"desc": "SMTP-Port",
-			"key": "pkgwizard_smtp_port",
-			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[1-9]\\d{0,4}$/"
-				}
-			}
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie den Benutzernamen des SMTP-Servers ein.",
-		"subitems": [{
-			"desc": "SMTP-Benutzername",
-			"key": "pkgwizard_smtp_user"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie das Kennwort für den SMTP-Server ein.",
-		"subitems": [{
-			"desc": "SMTP-Kennwort",
-			"key": "pkgwizard_smtp_pass"
-		}],
-		"type": "password"
-	},
-	{
-		"desc": "Überprüfen Sie, wenn GitLab verbunden ist, das SSL-Zertifikat des SMTP-Servers.",
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Überprüfen Sie das SSL-Zertifikat und weisen Sie unsichere Verbindungen zurück.",
-			"key": "pkgwizard_smtp_verify"
-		}],
-		"type": "multiselect"
-	}]
-},
-{
-	"step_title": "GitLab Info",
-	"items": [{
-		"desc": "Der Standard-Anmeldename ist root/5iveL!fe"
-	}]
-}]
--- a/src/GitLab/WIZARD_UIFILES/uninstall_uifile
+++ b/src/GitLab/WIZARD_UIFILES/uninstall_uifile
@ -1 +0,0 @@
-uninstall_uifile_enu
--- a/src/GitLab/WIZARD_UIFILES/uninstall_uifile_enu
+++ b/src/GitLab/WIZARD_UIFILES/uninstall_uifile_enu
@ -1,25 +0,0 @@
-[{
-    "step_title": "Uninstall GitLab",
-	"items": [{
-		"desc": "You can keep all your Gitlab data and install Gitlab later again.",
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Keep Gitlab Database and Files.",
-			"key": "pkgwizard_keep_data"
-		},
-		{
-			"defaultValue": false,
-			"desc": "Delete all data. (MariaDB Root password required)",
-			"key": "pkgwizard_delete_data"
-		}],
-		"type": "singleselect"
-	},
-	{
-		"desc": "Enter your MariaDB root password.",
-		"subitems": [{
-			"desc": "Root password",
-			"key": "pkgwizard_mysql_password"
-		}],
-		"type": "password"
-	}]
-}]
--- a/src/GitLab/WIZARD_UIFILES/uninstall_uifile_ger
+++ b/src/GitLab/WIZARD_UIFILES/uninstall_uifile_ger
@ -1,25 +0,0 @@
-[{
-    "step_title": "GitLab deinstallieren",
-	"items": [{
-		"desc": "Sie können alle Daten behalten um Gitlab später erneut zu installieren.",
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Gitlab Datenbank und Daten beibehalten.",
-			"key": "pkgwizard_keep_data"
-		},
-		{
-			"defaultValue": false,
-			"desc": "Alle Daten löschen. (MariaDB Root-Kennwort erforderlich)",
-			"key": "pkgwizard_delete_data"
-		}],
-		"type": "singleselect"
-	},
-	{
-		"desc": "Geben Sie Ihr Kennwort für MariaDB ein.",
-		"subitems": [{
-			"desc": "Root-Kennwort",
-			"key": "pkgwizard_mysql_password"
-		}],
-		"type": "password"
-	}]
-}]
--- a/src/GitLab/WIZARD_UIFILES/upgrade_uifile
+++ b/src/GitLab/WIZARD_UIFILES/upgrade_uifile
@ -1 +0,0 @@
-upgrade_uifile_enu
--- a/src/GitLab/WIZARD_UIFILES/upgrade_uifile_enu
+++ b/src/GitLab/WIZARD_UIFILES/upgrade_uifile_enu
@ -1,138 +0,0 @@
-[{
-	"step_title": "GitLab Configuration",
-	"items": [{
-		"desc": "If you don't want to change the settings , please do not modify any contents inside the corresponding field."
-	},	
-	{
-		"desc": "Please enter the GitLab administrator email account.",
-		"subitems": [{
-			"desc": "E-Mail",
-			"emptyText": "example@example.com",
-			"key": "pkgwizard_admin_email",
-			"validator": {
-				"vtype": "email"
-			}
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "GitLab Configuration",
-	"items": [{
-		"desc": "Please enter the full domain name for GitLab.",
-		"subitems": [{
-			"desc": "Domain name",
-			"emptyText": "localhost",
-			"key": "pkgwizard_hostname"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the HTTP port number for GitLab.",
-		"subitems": [{
-			"desc": "HTTP port number",
-			"emptyText": "30000",
-			"key": "pkgwizard_http_port"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Please enter the SSH port number for GitLab.",
-		"subitems": [{
-			"desc": "SSH port number",
-			"emptyText": "30001",
-			"key": "pkgwizard_ssh_port"
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "Database Configuration",
-	"items": [{
-		"desc": "Gitlab Database & User",
-		"subitems": [{
-			"desc": "Database",
-			"emptyText": "gitlab",
-			"key": "pkgwizard_db_name"
-		},
-		{
-			"desc": "Username",
-			"emptyText": "gitlab",
-			"key": "pkgwizard_db_user"
-		}],
-		"type": "textfield"
-	},
-	{
-	    "desc": " ",
-		"subitems": [{
-			"desc": "Password",
-			"key": "pkgwizard_db_password",
-			"defaultValue": "___EMPTY___"
-		}],
-		"type": "password"
-	}]
-},
-{
-	"step_title": "Enable GitLab to send emails through a SMTP server.",
-	"items": [{
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Don't chnange the email configuration",
-			"key": "pkgwizard_smtp_unchanged"
-		},
-		{
-			"defaultValue": false,
-			"desc": "New email configuration",
-			"key": "pkgwizard_smtp_new"
-		}],
-		"type": "singleselect"
-	},
-	{
-		"desc": "<hr style=\"width:98%;\">"
-	},
-	{
-		"subitems": [{
-			"defaultValue": false,
-			"desc": "Enable SMTP",
-			"key": "pkgwizard_smtp_enable"
-		}],
-		"type": "multiselect"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP address",
-			"key": "pkgwizard_smtp_address"
-		}],
-		"type": "textfield"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP port",
-			"emptyText": "587",
-			"key": "pkgwizard_smtp_port"
-		}],
-		"type": "textfield"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP username",
-			"key": "pkgwizard_smtp_user"
-		}],
-		"type": "textfield"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP password",
-			"key": "pkgwizard_smtp_pass"
-		}],
-		"type": "password"
-	},
-	{
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Verify the SSL certificate and refuse unsafe connections.",
-			"key": "pkgwizard_smtp_verify"
-		}],
-		"type": "multiselect"
-	}]
-}]
--- a/src/GitLab/WIZARD_UIFILES/upgrade_uifile_ger
+++ b/src/GitLab/WIZARD_UIFILES/upgrade_uifile_ger
@ -1,138 +0,0 @@
-[{
-	"step_title": "GitLab Konfiguration",
-	"items": [{
-		"desc": "Ändern Sie nicht den Inhalt des betreffenden Feldes, wenn Sie die Einstellungen nicht ändern möchten."
-	},	
-	{
-		"desc": "Geben Sie das E-Mail-Konto des GitLab-Administrators ein.",
-		"subitems": [{
-			"desc": "E-Mail",
-			"emptyText": "example@example.com",
-			"key": "pkgwizard_admin_email",
-			"validator": {
-				"vtype": "email"
-			}
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "GitLab Konfiguration",
-	"items": [{
-		"desc": "Geben Sie den vollständigen Domainnamen für GitLab ein.",
-		"subitems": [{
-			"desc": "Domainname",
-			"emptyText": "localhost",
-			"key": "pkgwizard_hostname"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie die HTTP-Portnummer für GitLab ein.",
-		"subitems": [{
-			"desc": "HTTP-Portnummer",
-			"emptyText": "30000",
-			"key": "pkgwizard_http_port"
-		}],
-		"type": "textfield"
-	},
-	{
-		"desc": "Geben Sie die SSH-Portnummer für GitLab ein.",
-		"subitems": [{
-			"desc": "SSH-Portnummer",
-			"emptyText": "30001",
-			"key": "pkgwizard_ssh_port"
-		}],
-		"type": "textfield"
-	}]
-},
-{
-	"step_title": "Datenbank Konfiguration",
-	"items": [{
-		"desc": "Gitlab Datenbank & Benutzer",
-		"subitems": [{
-			"desc": "Datenbankname",
-			"emptyText": "gitlab",
-			"key": "pkgwizard_db_name"
-		},
-		{
-			"desc": "Benutzer",
-			"emptyText": "gitlab",
-			"key": "pkgwizard_db_user"
-		}],
-		"type": "textfield"
-	},
-	{
-	    "desc": " ",
-		"subitems": [{
-			"desc": "Passwort",
-			"key": "pkgwizard_db_password",
-			"defaultValue": "___EMPTY___"
-		}],
-		"type": "password"
-	}]
-},
-{
-	"step_title": "GitLab Email Konfiguration",
-	"items": [{
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Email Konfiguration nicht ändern",
-			"key": "pkgwizard_smtp_unchanged"
-		},
-		{
-			"defaultValue": false,
-			"desc": "Neue Konfiguration",
-			"key": "pkgwizard_smtp_new"
-		}],
-		"type": "singleselect"
-	},
-	{
-		"desc": "<hr style=\"width:98%;\">"
-	},
-	{
-		"subitems": [{
-			"defaultValue": false,
-			"desc": "SMTP aktivieren",
-			"key": "pkgwizard_smtp_enable"
-		}],
-		"type": "multiselect"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP-Adresse",
-			"key": "pkgwizard_smtp_address"
-		}],
-		"type": "textfield"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP-Port",
-			"emptyText": "587",
-			"key": "pkgwizard_smtp_port"
-		}],
-		"type": "textfield"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP-Benutzername",
-			"key": "pkgwizard_smtp_user"
-		}],
-		"type": "textfield"
-	},
-	{
-		"subitems": [{
-			"desc": "SMTP-Kennwort",
-			"key": "pkgwizard_smtp_pass"
-		}],
-		"type": "password"
-	},
-	{
-		"subitems": [{
-			"defaultValue": true,
-			"desc": "Überprüfen Sie das SSL-Zertifikat und weisen Sie unsichere Verbindungen zurück.",
-			"key": "pkgwizard_smtp_verify"
-		}],
-		"type": "multiselect"
-	}]
-}]
--- a/src/GitLab/package/config/synology_gitlab
+++ b/src/GitLab/package/config/synology_gitlab
@ -1,114 +0,0 @@
-{
-	"cpu_priority": 0,
-	"enable_publish_all_ports": false,
-	"env_variables": [{
-		"key": "GITLAB_HOST",
-		"value": "__HOSTNAME__"
-	},
-	{
-		"key": "GITLAB_PORT",
-		"value": "__HTTP_PORT__"
-	},
-	{
-		"key": "GITLAB_SSH_PORT",
-		"value": "__SSH_PORT__"
-	},
-	{
-		"key": "UNICORN_TIMEOUT",
-		"value": "__UNICORN_TIMEOUT__"
-	},	
-	{
-		"key": "GITLAB_EMAIL",
-		"value": "__ADMIN_EMAIL__"
-	},
-	{
-		"key": "GITLAB_SECRETS_DB_KEY_BASE",
-		"value": "__CI_PARAPHRASE__"
-	},
-	{
-		"key": "GITLAB_SECRETS_SECRET_KEY_BASE",
-		"value": "__GITLAB_SECRETS_SECRET_KEY_BASE__"
-	},
-	{
-		"key": "GITLAB_SECRETS_OTP_KEY_BASE",
-		"value": "__GITLAB_SECRETS_OTP_KEY_BASE__"
-	},
-	{
-		"key": "DB_TYPE",
-		"value": "mysql"
-	},
-	{
-		"key": "DB_HOST",
-		"value": "__DB_HOST__"
-	},
-	{
-		"key": "DB_NAME",
-		"value": "__DB_NAME__"
-	},
-	{
-		"key": "DB_USER",
-		"value": "__DB_USER__"
-	},
-	{
-		"key": "DB_PASS",
-		"value": "__DB_PASS__"
-	},
-	{
-		"key": "SMTP_ENABLED",
-		"value": "__SMTP_ENABLE__"
-	},
-	{
-		"key": "SMTP_DOMAIN",
-		"value": "__SMTP_ADDR__"
-	},
-	{
-		"key": "SMTP_HOST",
-		"value": "__SMTP_ADDR__"
-	},
-	{
-		"key": "SMTP_PORT",
-		"value": "__SMTP_PORT__"
-	},
-	{
-		"key": "SMTP_USER",
-		"value": "__SMTP_USER__"
-	},
-	{
-		"key": "SMTP_PASS",
-		"value": "__SMTP_PASS__"
-	},
-	{
-		"key": "SMTP_OPENSSL_VERIFY_MODE",
-		"value": "__SMTP_VERIFY__"
-	}],
-	"image": "quay.io/sameersbn/gitlab:__GITLAB_VERSION__",
-	"is_package" : false,
-	"links": [{
-		"alias": "redisio",
-		"link_container": "synology_gitlab_redis"
-	}],
-	"memory_limit": 0,
-	"name": "synology_gitlab",
-	"port_bindings": [{
-		"container_port": 80,
-		"host_port": __HTTP_PORT__,
-		"type": "tcp"
-	},
-	{
-		"container_port": 22,
-		"host_port": __SSH_PORT__,
-		"type": "tcp"
-	}],
-	"privileged": false,
-	"shortcut": {
-		"enable_shortcut": false,
-		"enable_status_page": false,
-		"enable_web_page": false,
-		"web_page_url": ""
-	},
-	"volume_bindings": [{
-		"host_volume_file": "/docker/__SHARE__",
-		"mount_point": "/home/git/data",
-		"type": "rw"
-	}]
-}
--- a/src/GitLab/package/config/synology_gitlab_redis
+++ b/src/GitLab/package/config/synology_gitlab_redis
@ -1,15 +0,0 @@
-{
-	"cpu_priority": 0,
-	"enable_publish_all_ports": false,
-	"env_variables": [],
-	"image": "quay.io/sameersbn/redis:__REDIS_VERSION__",
-	"is_package": true,
-	"memory_limit": 0,
-	"name": "synology_gitlab_redis",
-	"port_bindings": [],
-	"privileged": false,
-	"shortcut": {
-		"enable_shortcut": false
-	},
-	"volume_bindings": []
-}
--- a/src/GitLab/package/ui/config
+++ b/src/GitLab/package/ui/config
@ -1,15 +0,0 @@
-{
-    ".url": {
-        "SYNO.SDS.Docker-GitLab": {
-            "allUsers": true,
-            "desc": "Docker GitLab",
-            "icon": "images/GitLab_{0}.png",
-            "port": "__HTTP_PORT__",
-            "protocol": "http",
-            "texts": "texts",
-            "title": "Docker GitLab",
-            "type": "url",
-            "url": "/"
-        }
-    }
-}
--- a/src/GitLab/package/ui/images/GitLab_16.png
+++ b/src/GitLab/package/ui/images/GitLab_16.png
--- a/src/GitLab/package/ui/images/GitLab_24.png
+++ b/src/GitLab/package/ui/images/GitLab_24.png
--- a/src/GitLab/package/ui/images/GitLab_256.png
+++ b/src/GitLab/package/ui/images/GitLab_256.png
--- a/src/GitLab/package/ui/images/GitLab_32.png
+++ b/src/GitLab/package/ui/images/GitLab_32.png
--- a/src/GitLab/package/ui/images/GitLab_48.png
+++ b/src/GitLab/package/ui/images/GitLab_48.png
--- a/src/GitLab/package/ui/images/GitLab_64.png
+++ b/src/GitLab/package/ui/images/GitLab_64.png
--- a/src/GitLab/package/ui/images/GitLab_72.png
+++ b/src/GitLab/package/ui/images/GitLab_72.png
--- a/src/GitLab/scripts/common
+++ b/src/GitLab/scripts/common
@ -1,41 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-. "$(dirname $0)"/lib
-
-PKG_NAME=Docker-GitLab
-PKG_SHORT=gitlab
-ETC_PATH="/var/packages/$PKG_NAME/etc"
-TARGET_PATH="/var/packages/$PKG_NAME/target"
-SHARE_PATH="$(synoshare --get docker | grep $'\t Path' | sed 's/.*\[\(.*\)].*/\1/')"
-
-DB_HOST=$(ip address show docker0 | grep inet | awk '{print $2}' | cut -f1 -d/ | head -n 1)
-API=/usr/syno/bin/synowebapi
-
-# Gitlab Version can be taken from here 
-# https://quay.io/repository/sameersbn/gitlab?tab=tags
-GITLAB_VERSION=10.1.1
-GITLAB_NAME=synology_gitlab
-GITLAB_PROFILE="$TARGET_PATH"/config/"$GITLAB_NAME"
-
-# Redis Version can be taken fom here
-# https://quay.io/repository/sameersbn/redis?tab=tags
-REDIS_VERSION=latest
-REDIS_NAME=synology_gitlab_redis
-REDIS_PROFILE="$TARGET_PATH"/config/"$REDIS_NAME"
-
-UNICORN_TIMEOUT=180
-GITLAB_SECRETS_OTP_KEY_BASE=/volume1/docker/gitlab/.secret
-
-if [ "$SYNOPKG_TEMP_LOGFILE" ]; then
-	log() {
-		local text="$1"
-		local idx=0
-		shift 1
-		for val in "$@"; do
-			text="${text/\{$idx\}/$val}"
-			let idx=1+$idx
-		done
-		echo "$text" >> $SYNOPKG_TEMP_LOGFILE
-	}
-fi
--- a/src/GitLab/scripts/lang/chs
+++ b/src/GitLab/scripts/lang/chs
@ -1,7 +0,0 @@
-failed_db_connect="无法连接到 MariaDB 服务器。请检查密码然后再试一次。"
-failed_downloading_image="正在下载图像，请在稍后启用此套件。"
-failed_illegal_dir_name="文件夹名称含有非法字符。"
-failed_remove_db="删除数据库 {0} 失败。"
-failed_remove_db_user="删除数据库用户 {0} 失败。"
-failed_remove_dir="删除文件夹 {0} 失败。"
-warning_all_data_lost="警告： 卸载后，所有的数据都将被删除。"
--- a/src/GitLab/scripts/lang/cht
+++ b/src/GitLab/scripts/lang/cht
@ -1,7 +0,0 @@
-failed_db_connect="MariaDB 伺服機連線失敗。請檢查密碼後再試一次。"
-failed_downloading_image="正在下載映像檔中，請稍後再啟用此套件。"
-failed_illegal_dir_name="資料夾名稱包含不合法字元。"
-failed_remove_db="刪除資料庫 {0} 失敗。"
-failed_remove_db_user="刪除資料庫使用者 {0} 失敗。"
-failed_remove_dir="刪除資料夾 {0} 失敗。"
-warning_all_data_lost="注意：解除安裝後，所有資料將會被刪除。"
--- a/src/GitLab/scripts/lang/csy
+++ b/src/GitLab/scripts/lang/csy
@ -1,7 +0,0 @@
-failed_db_connect="Připojení k serveru MariaDB se nezdařilo. Zkontrolujte heslo a zkuste to znovu."
-failed_downloading_image="Probíhá stahování obrázků, aktivujte tento balíček později."
-failed_illegal_dir_name="Název složky obsahuje neplatné znaky."
-failed_remove_db="Odebrání databáze {0} se nezdařilo."
-failed_remove_db_user="Odebrání uživatele {0} databáze se nezdařilo."
-failed_remove_dir="Odebrání složky {0} se nezdařilo."
-warning_all_data_lost="Upozornění: po odinstalování budou všechna data odstraněna."
--- a/src/GitLab/scripts/lang/dan
+++ b/src/GitLab/scripts/lang/dan
@ -1,7 +0,0 @@
-failed_db_connect="Kunne ikke oprette forbindelse to the MariaDB-server. Kontroller din adgangskode, og prøv igen."
-failed_downloading_image="Downloader billeder. Aktiver denne pakke senere."
-failed_illegal_dir_name="Mappenavnet indeholder ulovlige tegn."
-failed_remove_db="Kunne ikke fjerne databasen {0}."
-failed_remove_db_user="Kunne ikke fjerne databasebrugeren {0}."
-failed_remove_dir="Kunne ikke fjerne mappen {0}."
-warning_all_data_lost="Advarsel: Alle data bliver slettet efter fjernelse."
--- a/src/GitLab/scripts/lang/default
+++ b/src/GitLab/scripts/lang/default
@ -1 +0,0 @@
-enu
--- a/src/GitLab/scripts/lang/enu
+++ b/src/GitLab/scripts/lang/enu
@ -1,7 +0,0 @@
-failed_db_connect="Failed to connect to the MariaDB server. Please check your password and try again."
-failed_downloading_image="Downloading images, please enable this package later."
-failed_illegal_dir_name="The folder name contains illegal characters."
-failed_remove_db="Failed to remove the database {0}."
-failed_remove_db_user="Failed to remove the database user {0}."
-failed_remove_dir="Failed to remove the folder {0}."
-warning_all_data_lost="Warning: all data will be deleted after uninstallation."
--- a/src/GitLab/scripts/lang/fre
+++ b/src/GitLab/scripts/lang/fre
@ -1,7 +0,0 @@
-failed_db_connect="Échec de la connexion au serveur MariaDB. Veuillez vérifier votre mot de passe et réessayer."
-failed_downloading_image="Téléchargement des images en cours ; veuillez activer ce paquet plus tard."
-failed_illegal_dir_name="Le nom du dossier contient des caractères illégaux."
-failed_remove_db="Échec de la suppression de la base de données {0}."
-failed_remove_db_user="Échec de la suppression de l'utilisateur de la base de données {0}."
-failed_remove_dir="Échec de la suppression du dossier {0}."
-warning_all_data_lost="Avertissement : toutes les données seront supprimées après la désinstallation."
--- a/src/GitLab/scripts/lang/ger
+++ b/src/GitLab/scripts/lang/ger
@ -1,7 +0,0 @@
-failed_db_connect="Verbindung zum MariaDB-Server konnte nicht hergestellt werden. Überprüfen Sie Ihr Kennwort und versuchen Sie es erneut."
-failed_downloading_image="Bilder werden heruntergeladen, aktivieren Sie dieses Paket später."
-failed_illegal_dir_name="Der Name des Ordners enthält ungültige Zeichen."
-failed_remove_db="Datenbank {0} konnte nicht entfernt werden."
-failed_remove_db_user="Datenbankbenutzer {0} konnte nicht entfernt werden."
-failed_remove_dir="Ordner {0} konnte nicht entfernt werden."
-warning_all_data_lost="Warnung: Alle Daten werden durch die Deinstallation gelöscht."
--- a/src/GitLab/scripts/lang/hun
+++ b/src/GitLab/scripts/lang/hun
@ -1,7 +0,0 @@
-failed_db_connect="Nem sikerült csatlakozni a MariaDB kiszolgálóhoz. Ellenőrizze a jelszavát, és próbálja újra."
-failed_downloading_image="Képek letöltése... Kérjük, engedélyezze ezt a csomagot később."
-failed_illegal_dir_name="A mappa neve érvénytelen karaktereket tartalmaz."
-failed_remove_db="A(z) {0} adatbázis eltávolítása sikertelen."
-failed_remove_db_user="A(z) {0} adatbázis-felhasználó eltávolítása sikertelen."
-failed_remove_dir="A(z) {0} mappa eltávolítása sikertelen."
-warning_all_data_lost="Figyelem: az eltávolítás után minden adat törlődni fog."
--- a/src/GitLab/scripts/lang/ita
+++ b/src/GitLab/scripts/lang/ita
@ -1,7 +0,0 @@
-failed_db_connect="Impossibile collegarsi al server MariaDB. Controllare la password e riprovare."
-failed_downloading_image="Download immagini in corso. Abilitare il pacchetto in seguito."
-failed_illegal_dir_name="Il nome della cartella contiene caratteri non validi."
-failed_remove_db="Impossibile rimuovere il database {0}."
-failed_remove_db_user="Impossibile rimuovere l'utente del database {0}."
-failed_remove_dir="Impossibile rimuovere la cartella {0}."
-warning_all_data_lost="Avvertenza: dopo la disinstallazione tutti i dati verranno eliminati."
--- a/src/GitLab/scripts/lang/jpn
+++ b/src/GitLab/scripts/lang/jpn
@ -1,7 +0,0 @@
-failed_db_connect="MariaDB サーバーへの接続に失敗しました。パスワードを確認してもう一度行ってください。"
-failed_downloading_image="イメージをダウンロードしています。後からこのパッケージを有効にしてください。"
-failed_illegal_dir_name="フォルダ名に不正な文字が含まれています。"
-failed_remove_db="{0} データベースの削除に失敗しました。"
-failed_remove_db_user="{0} データベースユーザーの削除に失敗しました。"
-failed_remove_dir="{0} フォルダの削除に失敗しました。"
-warning_all_data_lost="警告： アンインストール後に、全てのデータが消去されます。"
--- a/src/GitLab/scripts/lang/krn
+++ b/src/GitLab/scripts/lang/krn
@ -1,7 +0,0 @@
-failed_db_connect="MariaDB 서버에 연결 실패. 패스워드를 확인한 다음 다시 시도하십시오."
-failed_downloading_image="이미지 다운로드 중. 이 패키지를 나중에 활성화하십시오."
-failed_illegal_dir_name="폴더 이름에 잘못된 문자가 포함되어 있습니다."
-failed_remove_db="데이터베이스 {0} 제거 실패."
-failed_remove_db_user="데이터베이스 사용자 {0} 제거 실패."
-failed_remove_dir="폴더 {0} 제거 실패."
-warning_all_data_lost="경고: 설치 제거 후 모든 데이터가 삭제됩니다."
--- a/src/GitLab/scripts/lang/nld
+++ b/src/GitLab/scripts/lang/nld
@ -1,7 +0,0 @@
-failed_db_connect="Kon geen verbinding maken met de MariaDB-server. Controleer uw wachtwoord en probeer het opnieuw."
-failed_downloading_image="Bezig met downloaden van pakketten. Schakel dit pakket later in."
-failed_illegal_dir_name="De mapnaam bevat niet-toegestane tekens."
-failed_remove_db="Kan de database {0} niet verwijderen."
-failed_remove_db_user="Kan de databasegebruiker {0} niet verwijderen."
-failed_remove_dir="Kan de map {0} niet verwijderen."
-warning_all_data_lost="Waarschuwing: als u de installatie ongedaan maakt, worden alle gegevens verwijderd."
--- a/src/GitLab/scripts/lang/nor
+++ b/src/GitLab/scripts/lang/nor
@ -1,7 +0,0 @@
-failed_db_connect="Kan ikke koble til MariaDB-serveren. Kontroller passordet og prøv på nytt."
-failed_downloading_image="Laster ned bilder, aktiver denne pakken senere."
-failed_illegal_dir_name="Mappenavnet inneholder ugyldige tegn."
-failed_remove_db="Kan ikke fjerne databasen {0}."
-failed_remove_db_user="Kan ikke fjerne databasebrukeren {0}."
-failed_remove_dir="Kan ikke fjerne mappen {0}."
-warning_all_data_lost="Advarsel: alle data vil bli slettet etter avinstalleringen."
--- a/src/GitLab/scripts/lang/plk
+++ b/src/GitLab/scripts/lang/plk
@ -1,7 +0,0 @@
-failed_db_connect="Nie można nawiązać połączenia z serwerem MariaDB. Sprawdź swoje hasło i spróbuj ponownie."
-failed_downloading_image="Włącz ten pakiet później, ponieważ trwa pobieranie obrazów."
-failed_illegal_dir_name="Nazwa folderu zawiera niedozwolone znaki."
-failed_remove_db="Nie można usunąć bazy danych {0}."
-failed_remove_db_user="Nie można usunąć użytkownika bazy danych {0}."
-failed_remove_dir="Nie można usunąć folderu {0}."
-warning_all_data_lost="Ostrzeżenie: wszystkie dane zostaną usunięte po odinstalowaniu."
--- a/src/GitLab/scripts/lang/ptb
+++ b/src/GitLab/scripts/lang/ptb
@ -1,7 +0,0 @@
-failed_db_connect="Erro na conexão com o servidor MariaDB. Verifique a senha e tente novamente."
-failed_downloading_image="Baixando imagens, habilite esse pacote mais tarde."
-failed_illegal_dir_name="O nome da pasta contém caracteres inválidos."
-failed_remove_db="Falha ao criar o banco de dados {0}."
-failed_remove_db_user="Falha ao remover o usuário do banco de dados {0}."
-failed_remove_dir="Falha ao remover a pasta {0}."
-warning_all_data_lost="Aviso: todos os dados serão excluídos após a desinstalação."
--- a/src/GitLab/scripts/lang/ptg
+++ b/src/GitLab/scripts/lang/ptg
@ -1,7 +0,0 @@
-failed_db_connect="Falha ao ligar ao servidor MariaDB. Verifique a sua palavra-passe e tente novamente."
-failed_downloading_image="A transferir imagens, active mais tarde este pacote."
-failed_illegal_dir_name="O nome da pasta contém caracteres ilegais."
-failed_remove_db="Não foi possível remover a base de dados {0}."
-failed_remove_db_user="Não foi possível remover o utilizador da base de dados {0}."
-failed_remove_dir="Não foi possível remover a pasta {0}."
-warning_all_data_lost="Aviso: todos os dados serão eliminados apés a desinstalação."
--- a/src/GitLab/scripts/lang/rus
+++ b/src/GitLab/scripts/lang/rus
@ -1,7 +0,0 @@
-failed_db_connect="Не удалось подключиться к серверу MariaDB. Проверьте свой пароль и повторите попытку."
-failed_downloading_image="Выполняется загрузка изображений, включите этот пакет позже."
-failed_illegal_dir_name="Имя папки содержит недопустимые символы."
-failed_remove_db="Не удалось удалить базу данных {0}."
-failed_remove_db_user="Не удалось удалить пользователя базы данных {0}."
-failed_remove_dir="Не удалось удалить папку {0}."
-warning_all_data_lost="Внимание! После удаления программы будут удалены все данные."
--- a/src/GitLab/scripts/lang/spn
+++ b/src/GitLab/scripts/lang/spn
@ -1,7 +0,0 @@
-failed_db_connect="Error de conexión con el servidor MariaDB. Compruebe su contraseña y vuelva a intentarlo."
-failed_downloading_image="Descargando imágenes; habilite este paquete más tarde."
-failed_illegal_dir_name="El nombre de carpeta contiene caracteres no válidos."
-failed_remove_db="No se pudo eliminar la base de datos {0}."
-failed_remove_db_user="No se pudo eliminar el usuario de la base de datos {0}."
-failed_remove_dir="No se pudo eliminar la carpeta {0}."
-warning_all_data_lost="Advertencia: tras la desinstalación se eliminarán todos los datos."
--- a/src/GitLab/scripts/lang/sve
+++ b/src/GitLab/scripts/lang/sve
@ -1,7 +0,0 @@
-failed_db_connect="Kunde inte att ansluta till MariaDB-servern. Kontrollera ditt lösenord och försök igen."
-failed_downloading_image="Laddar ner bilder, vänligen aktivera det här filpaketet senare."
-failed_illegal_dir_name="Namnet på mappen innehåller otillåtna tecken."
-failed_remove_db="Kunde inte ta bort databasen {0}."
-failed_remove_db_user="Kunde inte ta bort databasanvändaren {0}."
-failed_remove_dir="Kunde inte ta bort mappen {0}."
-warning_all_data_lost="Varning, allt data kommer att vara raderat efter avinstallation."
--- a/src/GitLab/scripts/lang/trk
+++ b/src/GitLab/scripts/lang/trk
@ -1,7 +0,0 @@
-failed_db_connect="MariaDB sunucusuna bağlanılamadı. Lütfen parolanızı kontrol edin ve yeniden deneyin."
-failed_downloading_image="Görüntüler indiriliyor, lütfen bu paketi daha sonra etkinleştirin."
-failed_illegal_dir_name="Klasör adında geçersiz karakterler var."
-failed_remove_db="Veritabanı {0} kaldırılamadı."
-failed_remove_db_user="Veritabanı kullanıcısı {0} kaldırılamadı."
-failed_remove_dir="Klasör {0} kaldırılamadı."
-warning_all_data_lost="Uyarı: kaldırma sonrasında tüm veriler silinecek."
--- a/src/GitLab/scripts/lib
+++ b/src/GitLab/scripts/lib
@ -1,10 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2013 Synology Inc. All rights reserved.
-# This file is generated by synopkglib tool, don't modify by hand.
-
-LANG_FILE="$(dirname "$0")/lang/$SYNOPKG_DSM_LANGUAGE"
-if [ -f "${LANG_FILE}" ]; then
-	. "${LANG_FILE}"
-else
-	. "$(dirname "$0")/lang/default"
-fi
--- a/src/GitLab/scripts/postinst
+++ b/src/GitLab/scripts/postinst
@ -1,93 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-[ "$SYNOPKG_PKG_STATUS" = UPGRADE ] && exit 0
-
-. "$(dirname $0)"/common
-
-HTTP_PORT="$pkgwizard_http_port"
-SSH_PORT="$pkgwizard_ssh_port"
-DB_NAME="$pkgwizard_db_name"
-DB_USER="$pkgwizard_db_user"
-DB_PASS="$pkgwizard_db_password"
-MARIADB_PASS="$pkgwizard_mysql_password"
-CI_PARAPHRASE="$(openssl rand -base64 48 | sed 's,/,_,g')"
-GITLAB_SECRETS_SECRET_KEY_BASE="$(openssl rand -base64 48 | sed 's,/,_,g')"
-HOSTNAME="$pkgwizard_hostname"
-ADMIN_EMAIL="$pkgwizard_admin_email"
-SMTP_ENABLE="$pkgwizard_smtp_enable"
-SMTP_ADDR="$pkgwizard_smtp_address"
-SMTP_PORT="$pkgwizard_smtp_port"
-SMTP_USER="$pkgwizard_smtp_user"
-SMTP_PASS="$pkgwizard_smtp_pass"
-SMTP_VERIFY="$pkgwizard_smtp_verify"
-SHARE="$pkgwizard_dataroot"
-
-if [ ! -z "$MARIADB_PASS" ]; then
-	echo "CREATE DATABASE IF NOT EXISTS \`$DB_NAME\` DEFAULT CHARACTER SET \`utf8\` COLLATE \`utf8_unicode_ci\`;"                         | mysql -uroot "-p$MARIADB_PASS"
-	echo "CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PASS'; GRANT ALL PRIVILEGES ON \`$DB_NAME\`.* TO '$DB_USER'@'%';"                 | mysql -uroot "-p$MARIADB_PASS"
-	echo "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS'; GRANT ALL PRIVILEGES ON \`$DB_NAME\`.* TO '$DB_USER'@'localhost';" | mysql -uroot "-p$MARIADB_PASS"		
-elif [ ! mysql -u$DB_USER -p"$DB_PASS" $DB_NAME -e exit ]; then
-	log "$failed_db_connect"
-	exit 1
-fi
-
-(
-	echo HTTP_PORT="\"$HTTP_PORT\""
-	echo SSH_PORT="\"$SSH_PORT\""
-	echo UNICORN_TIMEOUT="\"$UNICORN_TIMEOUT\""
-	echo DB_NAME="\"$DB_NAME\""
-	echo DB_USER="\"$DB_USER\""
-	echo DB_PASS="\"$DB_PASS\""
-	echo CI_PARAPHRASE="\"$CI_PARAPHRASE\""
-	echo GITLAB_SECRETS_SECRET_KEY_BASE="\"$GITLAB_SECRETS_SECRET_KEY_BASE\""
-	echo GITLAB_SECRETS_OTP_KEY_BASE="\"$GITLAB_SECRETS_OTP_KEY_BASE\""
-	echo HOSTNAME="\"$HOSTNAME\""
-	echo ADMIN_EMAIL="\"$ADMIN_EMAIL\""
-	echo SMTP_ENABLE="\"$SMTP_ENABLE\""
-	echo SMTP_ADDR="\"$SMTP_ADDR\""
-	echo SMTP_PORT="\"$SMTP_PORT\""
-	echo SMTP_USER="\"$SMTP_USER\""
-	echo SMTP_PASS="\"$SMTP_PASS\""
-	echo SMTP_VERIFY="\"$SMTP_VERIFY\""
-	echo SHARE="\"$SHARE\""
-) > "$ETC_PATH"/config
-
-sed -i \
-	-e "s/__HTTP_PORT__/$HTTP_PORT/g" \
-	"$TARGET_PATH"/ui/config 
-	
-sed -i \
-	-e "s/__REDIS_VERSION__/$REDIS_VERSION/g" \
-	"$REDIS_PROFILE"
-	
-sed -i \
-	-e "s/__HTTP_PORT__/$HTTP_PORT/g" \
-	-e "s/__SSH_PORT__/$SSH_PORT/g" \
-	-e "s/__UNICORN_TIMEOUT__/$UNICORN_TIMEOUT/g" \
-	-e "s/__DB_HOST__/$DB_HOST/g" \
-	-e "s/__DB_NAME__/$DB_NAME/g" \
-	-e "s/__DB_USER__/$DB_USER/g" \
-	-e "s/__DB_PASS__/$DB_PASS/g" \
-	-e "s/__CI_PARAPHRASE__/$CI_PARAPHRASE/g" \
-	-e "s/__GITLAB_SECRETS_SECRET_KEY_BASE__/$GITLAB_SECRETS_SECRET_KEY_BASE/g" \
-	-e "s#__GITLAB_SECRETS_OTP_KEY_BASE__#$GITLAB_SECRETS_OTP_KEY_BASE#g" \
-	-e "s/__HOSTNAME__/$HOSTNAME/g" \
-	-e "s/__ADMIN_EMAIL__/$ADMIN_EMAIL/g" \
-	-e "s/__SMTP_ENABLE__/$SMTP_ENABLE/g" \
-	-e "s/__SMTP_ADDR__/$SMTP_ADDR/g" \
-	-e "s/__SMTP_PORT__/$SMTP_PORT/g" \
-	-e "s/__SMTP_USER__/$SMTP_USER/g" \
-	-e "s/__SMTP_PASS__/$SMTP_PASS/g" \
-	-e "s/__SMTP_VERIFY__/$([ "$SMTP_VERIFY" = true ] && echo peer || echo none)/g" \
-	-e "s/__GITLAB_VERSION__/$GITLAB_VERSION/g" \
-	-e "s/__SHARE__/$SHARE/g" \
-	"$GITLAB_PROFILE"
-	
-docker pull quay.io/sameersbn/redis:$REDIS_VERSION	
-docker pull quay.io/sameersbn/gitlab:$GITLAB_VERSION
-	
-$API --exec api=SYNO.Docker.Container version=1 method=create is_run_instantly=false profile="$(cat "$REDIS_PROFILE")"
-$API --exec api=SYNO.Docker.Container version=1 method=create is_run_instantly=false profile="$(cat "$GITLAB_PROFILE")"
-
-exit 0
--- a/src/GitLab/scripts/postuninst
+++ b/src/GitLab/scripts/postuninst
@ -1,45 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-[ "$SYNOPKG_PKG_STATUS" = UPGRADE ] && exit 0
-
-. "$(dirname $0)"/common
-. "$ETC_PATH"/config
-
-/usr/syno/bin/synowebapi --exec api=SYNO.Docker.Container version=1 method=delete name=synology_gitlab_redis force=true preserve_profile=false
-/usr/syno/bin/synowebapi --exec api=SYNO.Docker.Container version=1 method=delete name=synology_gitlab force=true preserve_profile=false
-
-#remove all old gitlab & redis docker images
-docker rmi -f $(docker images | grep "^quay.io/sameersbn/gitlab" | awk '{print $3}')
-docker rmi -f $(docker images | grep "^quay.io/sameersbn/redis" | awk '{print $3}')
-
-if [ "$pkgwizard_delete_data" = true ]; then
-	
-	SQL_DROP_USER="DROP USER '$DB_USER'@'%';"
-	SQL_DROP_USER_LOCAL="DROP USER '$DB_USER'@'localhost';"
-	SQL_DROP_DATABASE="DROP DATABASE \`$DB_NAME\`;"
-
-	if ! echo $SQL_DROP_USER | mysql -uroot -p"$pkgwizard_mysql_password"; then
-		logger -p 0 "$PKG_NAME: failed to remove user $DB_USER"
-		log "$failed_remove_db_user" "$DB_USER"
-	fi
-
-	if ! echo $SQL_DROP_USER_LOCAL | mysql -uroot -p"$pkgwizard_mysql_password"; then
-		logger -p 0 "$PKG_NAME: failed to remove local user $DB_USER"
-		log "$failed_remove_db_user" "$DB_USER"
-	fi
-	
-	if ! echo $SQL_DROP_DATABASE | mysql -uroot -p"$pkgwizard_mysql_password"; then
-		logger -p 0 "$PKG_NAME: failed to remove the database $DB_NAME"
-		log "$failed_remove_db" "$DB_NAME"
-	fi
-
-	if ! rm -Rf "$SHARE_PATH/$SHARE"; then
-		logger -p 0 "$PKG_NAME: failed to remove the folder $SHARE"
-		log "$failed_remove_dir" "$SHARE"
-	fi
-
-	rm "$ETC_PATH"/config
-fi
-
-exit 0
--- a/src/GitLab/scripts/postupgrade
+++ b/src/GitLab/scripts/postupgrade
@ -1,92 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-. "$(dirname $0)"/common
-. "$ETC_PATH"/config
-
-[ "$pkgwizard_admin_email" ]                && ADMIN_EMAIL="$pkgwizard_admin_email"
-[ "$pkgwizard_hostname" ]                   && HOSTNAME="$pkgwizard_hostname"
-[ "$pkgwizard_http_port" ]                  && HTTP_PORT="$pkgwizard_http_port"
-[ "$pkgwizard_ssh_port" ]                   && SSH_PORT="$pkgwizard_ssh_port"
-[ "$pkgwizard_db_name" ]                    && DB_NAME="$pkgwizard_db_name"
-[ "$pkgwizard_db_user" ]                    && DB_USER="$pkgwizard_db_user"
-[ "$pkgwizard_db_password" != ___EMPTY___ ] && DB_PASS="$pkgwizard_db_password"
-
-if [ "$pkgwizard_smtp_unchanged" != true ]; then
-  [ "$pkgwizard_smtp_enable"  ] && SMTP_ENABLE ="$pkgwizard_smtp_enable"
-  [ "$pkgwizard_smtp_address" ] && SMTP_ADDR   ="$pkgwizard_smtp_address"
-  [ "$pkgwizard_smtp_port"    ] && SMTP_PORT   ="$pkgwizard_smtp_port"
-  [ "$pkgwizard_smtp_user"    ] && SMTP_USER   ="$pkgwizard_smtp_user"
-  [ "$pkgwizard_smtp_pass"    ] && SMTP_PASS   ="$pkgwizard_smtp_pass"
-  [ "$pkgwizard_smtp_verify"  ] && SMTP_VERIFY ="$pkgwizard_smtp_verify"
-fi
-
-#fallback for Upgrade from Gitlab 7.x.x
-if [ -z "$CI_PARAPHRASE" ]; then
-	CI_PARAPHRASE="$(openssl rand -base64 48 | sed 's,/,_,g')"
-fi
-
-#fallback for Upgrade from Gitlab 8.10.0
-if [ -z "$GITLAB_SECRETS_SECRET_KEY_BASE" ]; then
-	GITLAB_SECRETS_SECRET_KEY_BASE="$(openssl rand -base64 48 | sed 's,/,_,g')"
-fi
-
-(
-	echo HTTP_PORT="\"$HTTP_PORT\""
-	echo SSH_PORT="\"$SSH_PORT\""
-	echo UNICORN_TIMEOUT="\"$UNICORN_TIMEOUT\""
-	echo DB_NAME="\"$DB_NAME\""
-	echo DB_USER="\"$DB_USER\""
-	echo DB_PASS="\"$DB_PASS\""
-	echo CI_PARAPHRASE="\"$CI_PARAPHRASE\""
-	echo GITLAB_SECRETS_SECRET_KEY_BASE="\"$GITLAB_SECRETS_SECRET_KEY_BASE\""
-	echo GITLAB_SECRETS_OTP_KEY_BASE="\"$GITLAB_SECRETS_OTP_KEY_BASE\""
-	echo HOSTNAME="\"$HOSTNAME\""
-	echo ADMIN_EMAIL="\"$ADMIN_EMAIL\""
-	echo SMTP_ENABLE="\"$SMTP_ENABLE\""
-	echo SMTP_ADDR="\"$SMTP_ADDR\""
-	echo SMTP_PORT="\"$SMTP_PORT\""
-	echo SMTP_USER="\"$SMTP_USER\""
-	echo SMTP_PASS="\"$SMTP_PASS\""
-	echo SMTP_VERIFY="\"$SMTP_VERIFY\""
-	echo SHARE="\"$SHARE\""
-) > "$ETC_PATH"/config
-
-sed -i \
-	-e "s/__HTTP_PORT__/$HTTP_PORT/g" \
-	"$TARGET_PATH"/ui/config
-
-sed -i \
-	-e "s/__REDIS_VERSION__/$REDIS_VERSION/g" \
-	"$REDIS_PROFILE"
-
-sed -i \
-	-e "s/__HTTP_PORT__/$HTTP_PORT/g" \
-	-e "s/__SSH_PORT__/$SSH_PORT/g" \
-	-e "s/__UNICORN_TIMEOUT__/$UNICORN_TIMEOUT/g" \
-	-e "s/__DB_HOST__/$DB_HOST/g" \
-	-e "s/__DB_NAME__/$DB_NAME/g" \
-	-e "s/__DB_USER__/$DB_USER/g" \
-	-e "s/__DB_PASS__/$DB_PASS/g" \
-	-e "s/__CI_PARAPHRASE__/$CI_PARAPHRASE/g" \
-	-e "s/__GITLAB_SECRETS_SECRET_KEY_BASE__/$GITLAB_SECRETS_SECRET_KEY_BASE/g" \
-	-e "s#__GITLAB_SECRETS_OTP_KEY_BASE__#$GITLAB_SECRETS_OTP_KEY_BASE#g" \
-	-e "s/__HOSTNAME__/$HOSTNAME/g" \
-	-e "s/__ADMIN_EMAIL__/$ADMIN_EMAIL/g" \
-	-e "s/__SMTP_ENABLE__/$SMTP_ENABLE/g" \
-	-e "s/__SMTP_ADDR__/$SMTP_ADDR/g" \
-	-e "s/__SMTP_PORT__/$SMTP_PORT/g" \
-	-e "s/__SMTP_USER__/$SMTP_USER/g" \
-	-e "s/__SMTP_PASS__/$SMTP_PASS/g" \
-	-e "s/__SMTP_VERIFY__/$([ "$SMTP_VERIFY" = true ] && echo peer || echo none)/g" \
-	-e "s/__GITLAB_VERSION__/$GITLAB_VERSION/g" \
-	-e "s/__SHARE__/$SHARE/g" \
-	"$GITLAB_PROFILE"
-
-docker pull quay.io/sameersbn/redis:$REDIS_VERSION
-docker pull quay.io/sameersbn/gitlab:$GITLAB_VERSION
-
-$API --exec api=SYNO.Docker.Container version=1 method=create is_run_instantly=false profile="$(cat "$REDIS_PROFILE")"
-$API --exec api=SYNO.Docker.Container version=1 method=create is_run_instantly=false profile="$(cat "$GITLAB_PROFILE")"
-
-exit 0
--- a/src/GitLab/scripts/preinst
+++ b/src/GitLab/scripts/preinst
@ -1,32 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-[ "$SYNOPKG_PKG_STATUS" = UPGRADE ] && exit 0
-
-. "$(dirname $0)"/common
-
-if [ -z "$pkgwizard_dataroot" ]; then
-	log "$failed_illegal_dir_name" "$pkgwizard_dataroot"
-	exit 1
-fi
-
-# check mariadb password
-if [ ! -z "$pkgwizard_mysql_password" ]; then
-	if [ "$(mysqladmin ping -p"$pkgwizard_mysql_password")" != "mysqld is alive" ]; then
-		log "$failed_db_connect"
-		exit 1
-	fi
-elif [ ! mysql -u$pkgwizard_db_user -p"$pkgwizard_db_password" $pkgwizard_db_name -e exit ]; then
-	log "$failed_db_connect"
-	exit 1
-fi
-
-# check share create
-dataPath="$SHARE_PATH/$pkgwizard_dataroot"
-if ! mkdir -p "$dataPath"; then
-	log "$failed_illegal_dir_name" "$pkgwizard_dataroot"
-	exit 1
-fi
-chmod 755 "$dataPath"
-
-exit 0
--- a/src/GitLab/scripts/preuninst
+++ b/src/GitLab/scripts/preuninst
@ -1,16 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-[ "$SYNOPKG_PKG_STATUS" = UPGRADE ] && exit 0
-
-. "$(dirname $0)"/common
-
-# check mariadb password
-if [ "$pkgwizard_delete_data" = true ]; then
-	if [ "$(mysqladmin ping -p"$pkgwizard_mysql_password")" != "mysqld is alive" ]; then
-		log "$failed_db_connect"
-		exit 1
-	fi
-fi 
-
-exit 0
--- a/src/GitLab/scripts/preupgrade
+++ b/src/GitLab/scripts/preupgrade
@ -1,24 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-. "$(dirname $0)"/common
-. "$ETC_PATH"/config
-
-[ "$pkgwizard_db_name" ]      && DB_NAME="$pkgwizard_db_name"
-[ "$pkgwizard_db_user" ]      && DB_USER="$pkgwizard_db_user"
-[ "$pkgwizard_db_password" ]  && DB_PASS="$pkgwizard_db_password"
-
-# check database
-if [ ! mysql -u$DB_USER -p"$DB_PASS" $DB_NAME -e exit ]; then
-	log "$failed_db_connect"
-	exit 1
-fi
-
-/usr/syno/bin/synowebapi --exec api=SYNO.Docker.Container version=1 method=delete name=synology_gitlab_redis force=true preserve_profile=false
-/usr/syno/bin/synowebapi --exec api=SYNO.Docker.Container version=1 method=delete name=synology_gitlab force=true preserve_profile=false
-
-#remove all old gitlab & redis docker images
-docker rmi -f $(docker images | grep "^quay.io/sameersbn/gitlab" | awk '{print $3}')
-docker rmi -f $(docker images | grep "^quay.io/sameersbn/redis" | awk '{print $3}')
-
-exit 0
--- a/src/GitLab/scripts/start-stop-status
+++ b/src/GitLab/scripts/start-stop-status
@ -1,34 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2000-2015 Synology Inc. All rights reserved.
-
-. "$(dirname $0)"/common
-UI_PATH="/usr/syno/synoman/webman/3rdparty/$PKG_NAME"
-DOCKER_BIN=/usr/local/bin/docker
-WEBAPI_BIN=/usr/syno/bin/synowebapi
-
-case "$1" in
-	start)
-		[ -d "$TARGET_PATH"/ui ] && ln -s "$TARGET_PATH"/ui "$UI_PATH"
-		# start gitlab twice to prevent /etc/host missing error
-		"$WEBAPI_BIN" --exec api=SYNO.Docker.Container version=1 method=start name="$GITLAB_NAME" && exit 0
-		"$WEBAPI_BIN" --exec api=SYNO.Docker.Container version=1 method=start name="$GITLAB_NAME" && exit 0
-		exit 1
-		;;
-
-	stop)
-		rm "$UI_PATH"
-		"$WEBAPI_BIN" --exec api=SYNO.Docker.Container version=1 method=stop name="$GITLAB_NAME" || exit 1
-		"$WEBAPI_BIN" --exec api=SYNO.Docker.Container version=1 method=stop name="$REDIS_NAME"  || exit 1
-		exit 0
-		;;
-
-	status)
-		"$DOCKER_BIN" inspect "$GITLAB_NAME" | grep -q "\"SynoStatus\": \"running\"," || exit 1
-		"$DOCKER_BIN" inspect "$REDIS_NAME"  | grep -q "\"SynoStatus\": \"running\"," || exit 1
-		exit 0
-		;;
-
-	*)
-		exit 1
-		;;
-esac
--- a/src/createspk.bat
+++ b/src/createspk.bat
@ -1 +0,0 @@
-createspk.sh GitLab GitLab-10.1.1
--- a/src/createspk.sh
+++ b/src/createspk.sh
@ -1,58 +0,0 @@
-#!/bin/bash
-dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-path=""
-copy=""
-project="$2"
-projectdir=""
-if [ -z "$1" ]; then
-    echo "please specify path"
-	exit
-fi
-
-if [[ "$1" = /* ]]; then
-   path=$1
-else
-   path=$dir/$1
-fi
-
-if [ ! -d "$path" ]; then
-  echo "path $path not found!"
-  exit
-fi
-
-copy=$path.tmp
-projectdir="$(dirname $path)"   # Returns "/from/hear/to"
-if [ -z "$project" ]; then
-    project="$(basename $path)" # Returns just "to"
-fi
-
-cp -R $path $copy
-cd $copy/package
-tar -czf $copy/package.tgz *
-rm -Rf $copy/package
-cd $copy
-
-tar -cvf $projectdir/$project.spk *
-rm -Rf $copy
-
-#docker pull quay.io/sameersbn/gitlab:8.2.3
-#docker pull quay.io/sameersbn/redis:latest
-#docker save --output="gitlab-8.2.3.tar" 'quay.io/sameersbn/gitlab:8.2.3'
-#docker save --output="redis-latest.tar" 'quay.io/sameersbn/redis:latest'
-#docker exec -it "synology_gitlab" bash
-
-
-
-#/usr/syno/bin/synowebapi --exec api=SYNO.Docker.Container version=1 method=delete name=synology_gitlab_redis force=true preserve_profile=false
-#/usr/syno/bin/synowebapi --exec api=SYNO.Docker.Container version=1 method=delete name=synology_gitlab force=true preserve_profile=false
-
-#docker rmi quay.io/sameersbn/redis:latest
-#docker rmi quay.io/sameersbn/gitlab:8.2.3
-
-# Remove dangling images
-#docker rmi $(docker images -q --filter dangling=true)
-
-#compress extracted docker Images
-# cd directory/
-# XZ_OPT=-9 tar -Jcvf redis-latest.tar.xz *
-# XZ_OPT=-9 tar -Jcvf gitlab-8.2.3.tar.xz *
--- a/versions/GitLab-10.0.2.spk
+++ b/versions/GitLab-10.0.2.spk
--- a/versions/GitLab-10.1.1.spk
+++ b/versions/GitLab-10.1.1.spk
--- a/versions/GitLab-8.10.0.spk
+++ b/versions/GitLab-8.10.0.spk
--- a/versions/GitLab-8.11.0.spk
+++ b/versions/GitLab-8.11.0.spk
--- a/versions/GitLab-8.11.2.spk
+++ b/versions/GitLab-8.11.2.spk
--- a/versions/GitLab-8.11.6.spk
+++ b/versions/GitLab-8.11.6.spk
--- a/versions/GitLab-8.12.3.spk
+++ b/versions/GitLab-8.12.3.spk
--- a/versions/GitLab-8.12.5.spk
+++ b/versions/GitLab-8.12.5.spk
--- a/versions/GitLab-8.12.6.spk
+++ b/versions/GitLab-8.12.6.spk
--- a/versions/GitLab-8.13.1.spk
+++ b/versions/GitLab-8.13.1.spk
--- a/versions/GitLab-8.13.5.spk
+++ b/versions/GitLab-8.13.5.spk
--- a/versions/GitLab-8.14.1.spk
+++ b/versions/GitLab-8.14.1.spk
--- a/versions/GitLab-8.15.2.spk
+++ b/versions/GitLab-8.15.2.spk
--- a/versions/GitLab-8.15.4.spk
+++ b/versions/GitLab-8.15.4.spk
--- a/versions/GitLab-8.16.3.spk
+++ b/versions/GitLab-8.16.3.spk
--- a/versions/GitLab-8.16.6.spk
+++ b/versions/GitLab-8.16.6.spk
--- a/versions/GitLab-8.3.2.spk
+++ b/versions/GitLab-8.3.2.spk
--- a/versions/GitLab-8.4.0.spk
+++ b/versions/GitLab-8.4.0.spk
--- a/versions/GitLab-8.4.3.spk
+++ b/versions/GitLab-8.4.3.spk
--- a/versions/GitLab-8.5.1.spk
+++ b/versions/GitLab-8.5.1.spk
--- a/versions/GitLab-8.5.8.spk
+++ b/versions/GitLab-8.5.8.spk
--- a/versions/GitLab-8.6.1.spk
+++ b/versions/GitLab-8.6.1.spk
--- a/versions/GitLab-8.7.0.spk
+++ b/versions/GitLab-8.7.0.spk
--- a/versions/GitLab-8.7.2.spk
+++ b/versions/GitLab-8.7.2.spk
--- a/versions/GitLab-8.7.5.spk
+++ b/versions/GitLab-8.7.5.spk
--- a/versions/GitLab-8.8.3.spk
+++ b/versions/GitLab-8.8.3.spk
--- a/versions/GitLab-8.9.0.spk
+++ b/versions/GitLab-8.9.0.spk
--- a/versions/GitLab-8.9.5.spk
+++ b/versions/GitLab-8.9.5.spk
--- a/versions/GitLab-9.0.0.spk
+++ b/versions/GitLab-9.0.0.spk
--- a/versions/GitLab-9.1.1.spk
+++ b/versions/GitLab-9.1.1.spk
--- a/versions/GitLab-9.2.2.spk
+++ b/versions/GitLab-9.2.2.spk
--- a/versions/GitLab-9.3.5.spk
+++ b/versions/GitLab-9.3.5.spk
--- a/versions/GitLab-9.4.4.spk
+++ b/versions/GitLab-9.4.4.spk
--- a/versions/GitLab-9.5.2.spk
+++ b/versions/GitLab-9.5.2.spk