From 2691c9517e228420363acb39b795d525e564fc7b Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Sat, 28 Oct 2017 12:37:47 +0200 Subject: [PATCH 01/40] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17612bf..6621009 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitlab for Yunohost -ETAT=WORKING +ETAT=INPROGRESS - [Yunohost project](https://yunohost.org) - [gitlab website](https://gitlab.com) From 15a9762042cac716bb3e3c43bc6354f496eaf551 Mon Sep 17 00:00:00 2001 From: bourreP Date: Sat, 14 Apr 2018 17:36:28 +0200 Subject: [PATCH 02/40] add change_url script --- scripts/change_url | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 scripts/change_url diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..7dccfc2 --- /dev/null +++ b/scripts/change_url @@ -0,0 +1,84 @@ +#!/bin/bash + +# Exit on command errors and treat unset variables as an error +set -eu + +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source /usr/share/yunohost/helpers + +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +old_domain=$YNH_APP_OLD_DOMAIN +old_path=$YNH_APP_OLD_PATH + +new_domain=$YNH_APP_NEW_DOMAIN +new_path=$YNH_APP_NEW_PATH + +app=$YNH_APP_INSTANCE_NAME + +portNginx=$(ynh_find_port 8080) +portUnicorn=$(ynh_find_port 9080) + +#================================================= +# CHECK PATHS SYNTAX +#================================================= + +test -n "$old_path" || old_path="/" +test -n "$new_path" || new_path="/" +new_path=$(ynh_normalize_url_path $new_path) +old_path=$(ynh_normalize_url_path $old_path) + +#================================================= +# CHECK WHICH PARTS SHOULD BE CHANGED +#================================================= + +change_domain=0 +if [ "$old_domain" != "$new_domain" ] +then + change_domain=1 +fi + +change_path=0 +if [ "$old_path" != "$new_path" ] +then + change_path=1 +fi + +#doc in: https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab + +# Gitlab configuration +nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +gitlab_conf_path=/etc/gitlab/gitlab.rb + +if [ $change_path -eq 1 ] +then + sudo gitlab-ctl stop unicorn + sudo gitlab-ctl stop sidekiq + + ynh_replace_string "location ${old_path%/}/" "location ${new_path%/}/" "$nginx_conf_path" + + ynh_replace_string "https://$old_domain${old_path%/}" "https://$old_domain${new_path%/}" "$gitlab_conf_path" +fi + +# Change the domain for nginx +if [ $change_domain -eq 1 ] +then + mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + + ynh_replace_string "https://$old_domain" "https://$new_domain" "$gitlab_conf_path" +fi + +if [ $change_domain -eq 1 ] || [ $change_path -eq 1 ] +then + sudo gitlab-ctl reconfigure +fi + +if [ $change_path -eq 1 ] +then + sudo gitlab-ctl restart +fi From c892c5172f28f164bc7d34dc429f1122543790a9 Mon Sep 17 00:00:00 2001 From: bourreP Date: Sat, 14 Apr 2018 17:50:36 +0200 Subject: [PATCH 03/40] update install script, working with relative path --- README.md | 6 ------ scripts/install | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 6621009..8729a07 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,6 @@ ETAT=INPROGRESS Gitlab is a git server similar to github. - - - -Gitlab work only with a root domain - - **Upgrade this package:** `sudo yunohost app upgrade --verbose gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh` diff --git a/scripts/install b/scripts/install index 99199ba..b83b174 100644 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,7 @@ admin=$YNH_APP_ARG_ADMIN # Source YunoHost helpers source /usr/share/yunohost/helpers -# Save app settings +# Save app settings ynh_app_setting_set "$app" is_public "$is_public" mailadmin=$(ynh_user_get_info $admin mail) @@ -49,9 +49,10 @@ sudo apt-get install -yy gitlab-ce # Gitlab configuration -sed -i "s@GENERATED_EXTERNAL_URL@https://$domain@" ../conf/gitlab.rb -sed -i "s@PORTNGINX@$portNginx@" ../conf/gitlab.rb -sed -i "s@PORTUNICORN@$portUnicorn@" ../conf/gitlab.rb +gitlab_conf_path=../conf/gitlab.rb +ynh_replace_string "GENERATED_EXTERNAL_URL" "https://$domain${path_url%/}" $gitlab_conf_path +ynh_replace_string "PORTNGINX" "$portNginx" $gitlab_conf_path +ynh_replace_string "PORTUNICORN" "$portUnicorn" $gitlab_conf_path sudo cp -f ../conf/gitlab.rb /etc/gitlab/gitlab.rb sudo gitlab-ctl reconfigure @@ -65,18 +66,11 @@ newuser.save" | sudo gitlab-rails console sudo gitlab-ctl reconfigure - - - -# Set permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) -# sudo chown -R root: $src_path - - # Modify Nginx configuration file and copy it to Nginx conf directory nginx_conf=../conf/nginx.conf -sed -i "s@YNH_WWW_PATH@$path_url@g" $nginx_conf -sed -i "s@PORT@$portNginx@g" $nginx_conf + +ynh_replace_string "YNH_WWW_PATH" "${path_url%/}/" $nginx_conf +ynh_replace_string "PORT" "$portNginx" $nginx_conf sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf From e2900f134c4f6909537416bd4725ef1f5e010c99 Mon Sep 17 00:00:00 2001 From: bourreP Date: Sat, 14 Apr 2018 18:02:02 +0200 Subject: [PATCH 04/40] add check domain/path --- scripts/change_url | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 7dccfc2..c528fd6 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,6 +33,10 @@ test -n "$new_path" || new_path="/" new_path=$(ynh_normalize_url_path $new_path) old_path=$(ynh_normalize_url_path $old_path) +# Check domain/path availability +sudo yunohost app checkurl "${new_domain}${new_path}" -a "$app" \ + || ynh_die "Path not available: ${new_domain}${new_path}" + #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= From 4d27a76276b669821c71136319af27c5b1d231a2 Mon Sep 17 00:00:00 2001 From: bourreP Date: Sat, 14 Apr 2018 18:07:57 +0200 Subject: [PATCH 05/40] update upgrade script --- scripts/upgrade | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2dffa9f..933a7bd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,40 +14,24 @@ domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path_url) admin=$(ynh_app_setting_get "$app" admin) is_public=$(ynh_app_setting_get "$app" is_public) -language=$(ynh_app_setting_get "$app" language) -# Remove trailing "/" for next commands -path_url=${path_url%/} +portNginx=$(ynh_find_port 8080) +portUnicorn=$(ynh_find_port 9080) -# Copy source files -src_path=/var/www/$app -sudo mkdir -p $src_path -sudo cp -a ../sources/. $src_path +# Gitlab configuration +gitlab_conf_path=../conf/gitlab.rb +ynh_replace_string "GENERATED_EXTERNAL_URL" "https://$domain${path_url%/}" $gitlab_conf_path +ynh_replace_string "PORTNGINX" "$portNginx" $gitlab_conf_path +ynh_replace_string "PORTUNICORN" "$portUnicorn" $gitlab_conf_path -# Set permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root: $src_path +sudo cp -f ../conf/gitlab.rb /etc/gitlab/gitlab.rb # Modify Nginx configuration file and copy it to Nginx conf directory nginx_conf=../conf/nginx.conf -sed -i "s@YNH_WWW_PATH@$path_url@g" $nginx_conf -sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf -# If a dedicated php-fpm process is used: -# -# sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf -sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# # Modify PHP-FPM pool configuration and copy it to the pool directory -# sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf -# sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/php-fpm.conf -# finalphpconf=/etc/php5/fpm/pool.d/$app.conf -# sudo cp ../conf/php-fpm.conf $finalphpconf -# sudo chown root: $finalphpconf -# sudo chmod 644 $finalphpconf -# sudo service php5-fpm restart -### PHP end ### +ynh_replace_string "YNH_WWW_PATH" "${path_url%/}/" $nginx_conf +ynh_replace_string "PORT" "$portNginx" $nginx_conf +sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then @@ -57,3 +41,4 @@ fi # Reload nginx service sudo service nginx reload +sudo gitlab-ctl reconfigure From 091656b3b45f05e984d48201f496b98b71bfe832 Mon Sep 17 00:00:00 2001 From: bourreP Date: Sat, 14 Apr 2018 18:38:22 +0200 Subject: [PATCH 06/40] make the upgrade --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 933a7bd..ec7e8f1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,6 +33,9 @@ ynh_replace_string "YNH_WWW_PATH" "${path_url%/}/" $nginx_conf ynh_replace_string "PORT" "$portNginx" $nginx_conf sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +sudo apt-get update +sudo apt-get install -yy gitlab-ce + # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # See install script @@ -41,4 +44,3 @@ fi # Reload nginx service sudo service nginx reload -sudo gitlab-ctl reconfigure From 293c0a5df9f4104fcc8b8aa976b6791a937e22e8 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Sun, 15 Apr 2018 13:05:15 +0200 Subject: [PATCH 07/40] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8729a07..60a1f4a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Gitlab for Yunohost -ETAT=INPROGRESS - [Yunohost project](https://yunohost.org) - [gitlab website](https://gitlab.com) From 80e008d7a70fbe1e8c29716d41228be9cd1ceb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sun, 16 Dec 2018 23:01:36 +0100 Subject: [PATCH 08/40] Add CI --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3e001c8 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +image: python:3.5-alpine +test: + script: + - apk update + - apk add git + - git clone https://github.com/YunoHost/package_linter + - python package_linter/package_linter.py . From 174568d197e880d6d13327ca5d1f41c79e712389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sun, 16 Dec 2018 23:01:46 +0100 Subject: [PATCH 09/40] Add gitlab license --- LICENSE | 23 ++++++++++++++++++++--- manifest.json | 11 +++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index 53d58f9..03cfbb8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,21 @@ -File containning the license of your package. +The MIT License (MIT) -More information here: -https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- +Copyright GitLab B.V. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/manifest.json b/manifest.json index 4583dc5..0b4ae06 100644 --- a/manifest.json +++ b/manifest.json @@ -2,25 +2,24 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, + "version": "1.5.3~ynh1", "description": { "en": "Gitlab for Yunohost.", "fr": "Gitlab pour YunoHost." }, "url": "https://gitlab.com", - "license": "free", + "license": "MIT", "maintainer": { "name": "rafi59", "email": "", "url": "http://example.com" }, "requirements": { - "yunohost": ">> 2.6.0" + "yunohost": ">> 3.0.0" }, - "multi_instance": true, + "multi_instance": false, "services": [ - "nginx", - "php5-fpm", - "mysql" + "nginx" ], "arguments": { "install" : [ From dd38c52fba8cef8b18fdf74b49bfefe557ddad84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sun, 16 Dec 2018 23:03:09 +0100 Subject: [PATCH 10/40] Change check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 378168f..2cc5a48 100644 --- a/check_process +++ b/check_process @@ -10,17 +10,17 @@ port="666" (PORT) ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 - setup_private=0 + setup_private=1 setup_public=1 upgrade=1 backup_restore=0 multi_instance=0 incorrect_path=1 port_already_use=0 - change_url=0 + change_url=1 ;;; Levels Level 1=auto Level 2=auto From 812815c5b9c05c00c4f1c41577bce5e2994c1aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sun, 16 Dec 2018 23:04:05 +0100 Subject: [PATCH 11/40] Add .src files --- conf/arm.src.default | 6 ++++++ conf/x86-64.src.default | 6 ++++++ scripts/upgrade.d/upgrade.sh | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 conf/arm.src.default create mode 100644 conf/x86-64.src.default create mode 100644 scripts/upgrade.d/upgrade.sh diff --git a/conf/arm.src.default b/conf/arm.src.default new file mode 100644 index 0000000..356637d --- /dev/null +++ b/conf/arm.src.default @@ -0,0 +1,6 @@ +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/stretch/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb +SOURCE_SUM=__SHA256_SUM__ +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitlab-ce___VERSION__-ce.0_armhf.deb +SOURCE_EXTRACT=false +SOURCE_FORMAT=deb \ No newline at end of file diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default new file mode 100644 index 0000000..2dbf563 --- /dev/null +++ b/conf/x86-64.src.default @@ -0,0 +1,6 @@ +SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb +SOURCE_SUM=__SHA256_SUM__ +SOURCE_SUM_PRG=sha256sum +SOURCE_FILENAME=gitlab-ce___VERSION__-ce.0_amd64.deb +SOURCE_EXTRACT=false +SOURCE_FORMAT=deb \ No newline at end of file diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh new file mode 100644 index 0000000..fb6ccf7 --- /dev/null +++ b/scripts/upgrade.d/upgrade.sh @@ -0,0 +1,5 @@ +gitlab_version="11.5.3" + +gitlab_x86_64_source_sha256="fdbea3e92eb1f613897659e99b20660d64524eaf5b1cd57a323cd6f61c573e7f" + +gitlab_arm_source_sha256="81d37736442be80d687b52299604ef38bc4000b7545b241094b7f5a027c9fac4" \ No newline at end of file From f9964402b282044fbe5fd0e9af12f0bb66eccc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sun, 16 Dec 2018 23:05:12 +0100 Subject: [PATCH 12/40] Rework install, change_url, remove and upgrade scripts --- conf/gitlab.rb | 6 +- conf/nginx.conf | 6 +- scripts/_common.sh | 682 +++++---------------------------------------- scripts/change_url | 43 +-- scripts/install | 91 +++--- scripts/remove | 31 ++- scripts/upgrade | 47 ++-- 7 files changed, 176 insertions(+), 730 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 6cae7f4..3322e3d 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1,4 +1,4 @@ -external_url 'GENERATED_EXTERNAL_URL' +external_url '__GENERATED_EXTERNAL_URL__' gitlab_rails['ldap_enabled'] = true gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block with 'EOS' below @@ -17,7 +17,7 @@ gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block user_filter: '' EOS -nginx['listen_port'] = PORTNGINX +nginx['listen_port'] = __PORT__ nginx['listen_https'] = false -unicorn['port'] = PORTUNICORN +unicorn['port'] = __PORTUNICORN__ diff --git a/conf/nginx.conf b/conf/nginx.conf index b4e5fd9..2802c89 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ -location YNH_WWW_PATH { - - proxy_pass http://localhost:PORT; +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { + proxy_pass http://localhost:__PORT__; proxy_set_header Host $host; proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/scripts/_common.sh b/scripts/_common.sh index 4c3d5f0..4da342f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,419 +1,86 @@ -#!/bin/bash +#================================================= +# SET ALL CONSTANTS +#================================================= -# ============================================================================= -# YUNOHOST 2.6 FORTHCOMING HELPERS -# (will be part of YunoHost 2.6, so won't be necessary any more after -# YunoHost 2.6 gets widespread) -# ============================================================================= +app=$YNH_APP_INSTANCE_NAME +config_path="/etc/$app" +final_path="/opt/$app" -# Normalize the url path syntax -# Handle the slash at the beginning of path and its absence at ending -# Return a normalized url path -# -# example: url_path=$(ynh_normalize_url_path $url_path) -# ynh_normalize_url_path example -> /example -# ynh_normalize_url_path /example -> /example -# ynh_normalize_url_path /example/ -> /example -# ynh_normalize_url_path / -> / -# -# usage: ynh_normalize_url_path path_to_normalize -# | arg: url_path_to_normalize - URL path to normalize before using it -ynh_normalize_url_path () { - path_url=$1 - test -n "$path_url" || ynh_die "ynh_normalize_url_path expect a URL path as first argument and received nothing." - if [ "${path_url:0:1}" != "/" ]; then # If the first character is not a / - path_url="/$path_url" # Add / at begin of path variable - fi - if [ "${path_url:${#path_url}-1}" == "/" ] && [ ${#path_url} -gt 1 ]; then # If the last character is a / and that not the only character. - path_url="${path_url:0:${#path_url}-1}" # Delete the last character - fi - echo $path_url -} +# Detect the system architecture to download the right tarball +# NOTE: `uname -m` is more accurate and universal than `arch` +# See https://en.wikipedia.org/wiki/Uname +if [ -n "$(uname -m | grep 64)" ]; then + architecture="x86-64" +elif [ -n "$(uname -m | grep 86)" ]; then + ynh_die "Gitlab is not compatible with x86 architecture" +elif [ -n "$(uname -m | grep arm)" ]; then + architecture="arm" +else + ynh_die "Unable to detect your achitecture, please open a bug describing \ + your hardware and the result of the command \"uname -m\"." 1 +fi -# Check if a mysql user exists -# -# usage: ynh_mysql_user_exists user -# | arg: user - the user for which to check existence -function ynh_mysql_user_exists() -{ - local user=$1 - if [[ -z $(ynh_mysql_execute_as_root "SELECT User from mysql.user WHERE User = '$user';") ]] - then - return 1 - else - return 0 - fi -} - -# Create a database, an user and its password. Then store the password in the app's config -# -# After executing this helper, the password of the created database will be available in $db_pwd -# It will also be stored as "mysqlpwd" into the app settings. -# -# usage: ynh_mysql_setup_db user name [pwd] -# | arg: user - Owner of the database -# | arg: name - Name of the database -# | arg: pwd - Password of the database. If not given, a password will be generated -ynh_mysql_setup_db () { - local db_user="$1" - local db_name="$2" - db_pwd=$(ynh_string_random) # Generate a random password - ynh_mysql_create_db "$db_name" "$db_user" "$db_pwd" # Create the database - ynh_app_setting_set $app mysqlpwd $db_pwd # Store the password in the app's config -} - -# Remove a database if it exists, and the associated user -# -# usage: ynh_mysql_remove_db user name -# | arg: user - Owner of the database -# | arg: name - Name of the database -ynh_mysql_remove_db () { - local db_user="$1" - local db_name="$2" - local mysql_root_password=$(sudo cat $MYSQL_ROOT_PWD_FILE) - if mysqlshow -u root -p$mysql_root_password | grep -q "^| $db_name"; then # Check if the database exists - echo "Removing database $db_name" >&2 - ynh_mysql_drop_db $db_name # Remove the database - else - echo "Database $db_name not found" >&2 - fi - - # Remove mysql user if it exists - if $(ynh_mysql_user_exists $db_user); then - ynh_mysql_drop_user $db_user - fi -} - -# Correct the name given in argument for mariadb -# -# Avoid invalid name for your database -# -# Exemple: dbname=$(ynh_make_valid_dbid $app) -# -# usage: ynh_make_valid_dbid name -# | arg: name - name to correct -# | ret: the corrected name -ynh_sanitize_dbid () { - dbid=${1//[-.]/_} # We should avoid having - and . in the name of databases. They are replaced by _ - echo $dbid -} - -# Manage a fail of the script -# -# Print a warning to inform that the script was failed -# Execute the ynh_clean_setup function if used in the app script -# -# usage of ynh_clean_setup function -# This function provide a way to clean some residual of installation that not managed by remove script. -# To use it, simply add in your script: -# ynh_clean_setup () { -# instructions... -# } -# This function is optionnal. -# -# Usage: ynh_exit_properly is used only by the helper ynh_abort_if_errors. -# You must not use it directly. -ynh_exit_properly () { - exit_code=$? - if [ "$exit_code" -eq 0 ]; then - exit 0 # Exit without error if the script ended correctly - fi - - trap '' EXIT # Ignore new exit signals - set +eu # Do not exit anymore if a command fail or if a variable is empty - - echo -e "!!\n $app's script has encountered an error. Its execution was cancelled.\n!!" >&2 - - if type -t ynh_clean_setup > /dev/null; then # Check if the function exist in the app script. - ynh_clean_setup # Call the function to do specific cleaning for the app. - fi - - ynh_die # Exit with error status -} - -# Exit if an error occurs during the execution of the script. -# -# Stop immediatly the execution if an error occured or if a empty variable is used. -# The execution of the script is derivate to ynh_exit_properly function before exit. -# -# Usage: ynh_abort_if_errors -ynh_abort_if_errors () { - set -eu # Exit if a command fail, and if a variable is used unset. - trap ynh_exit_properly EXIT # Capturing exit signals on shell script -} - -# Define and install dependencies with a equivs control file -# This helper can/should only be called once per app -# -# usage: ynh_install_app_dependencies dep [dep [...]] -# | arg: dep - the package name to install in dependence -ynh_install_app_dependencies () { - dependencies=$@ - manifest_path="../manifest.json" - if [ ! -e "$manifest_path" ]; then - manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place - fi - version=$(sudo grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file. - dep_app=${app//_/-} # Replace all '_' by '-' - - if ynh_package_is_installed "${dep_app}-ynh-deps"; then - echo "A package named ${dep_app}-ynh-deps is already installed" >&2 - else - cat > ./${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build -Section: misc -Priority: optional -Package: ${dep_app}-ynh-deps -Version: ${version} -Depends: ${dependencies// /, } -Architecture: all -Description: Fake package for ${app} (YunoHost app) dependencies - This meta-package is only responsible of installing its dependencies. -EOF - ynh_package_install_from_equivs ./${dep_app}-ynh-deps.control \ - || ynh_die "Unable to install dependencies" # Install the fake package and its dependencies - ynh_app_setting_set $app apt_dependencies $dependencies - fi -} - -# Remove fake package and its dependencies -# -# Dependencies will removed only if no other package need them. -# -# usage: ynh_remove_app_dependencies -ynh_remove_app_dependencies () { - dep_app=${app//_/-} # Replace all '_' by '-' - ynh_package_autoremove ${dep_app}-ynh-deps # Remove the fake package and its dependencies if they not still used. -} - -# Use logrotate to manage the logfile -# -# usage: ynh_use_logrotate [logfile] -# | arg: logfile - absolute path of logfile -# -# If no argument provided, a standard directory will be use. /var/log/${app} -# You can provide a path with the directory only or with the logfile. -# /parentdir/logdir/ -# /parentdir/logdir/logfile.log -# -# It's possible to use this helper several times, each config will added to same logrotate config file. -ynh_use_logrotate () { - if [ "$#" -gt 0 ]; then - if [ "$(echo ${1##*.})" == "log" ]; then # Keep only the extension to check if it's a logfile - logfile=$1 # In this case, focus logrotate on the logfile - else - logfile=$1/.log # Else, uses the directory and all logfile into it. - fi - else - logfile="/var/log/${app}/.log" # Without argument, use a defaut directory in /var/log - fi - cat > ./${app}-logrotate << EOF # Build a config file for logrotate -$logfile { - # Rotate if the logfile exceeds 100Mo - size 100M - # Keep 12 old log maximum - rotate 12 - # Compress the logs with gzip - compress - # Compress the log at the next cycle. So keep always 2 non compressed logs - delaycompress - # Copy and truncate the log to allow to continue write on it. Instead of move the log. - copytruncate - # Do not do an error if the log is missing - missingok - # Not rotate if the log is empty - notifempty - # Keep old logs in the same dir - noolddir -} -EOF - sudo mkdir -p $(dirname "$logfile") # Create the log directory, if not exist - cat ${app}-logrotate | sudo tee -a /etc/logrotate.d/$app > /dev/null # Append this config to the others for this app. If a config file already exist -} - -# Remove the app's logrotate config. -# -# usage: ynh_remove_logrotate -ynh_remove_logrotate () { - if [ -e "/etc/logrotate.d/$app" ]; then - sudo rm "/etc/logrotate.d/$app" - fi -} - -# Find a free port and return it -# -# example: port=$(ynh_find_port 8080) -# -# usage: ynh_find_port begin_port -# | arg: begin_port - port to start to search -ynh_find_port () { - port=$1 - test -n "$port" || ynh_die "The argument of ynh_find_port must be a valid port." - while netcat -z 127.0.0.1 $port # Check if the port is free - do - port=$((port+1)) # Else, pass to next port - done - echo $port -} - -# Create a system user -# -# usage: ynh_system_user_create user_name [home_dir] -# | arg: user_name - Name of the system user that will be create -# | arg: home_dir - Path of the home dir for the user. Usually the final path of the app. If this argument is omitted, the user will be created without home -ynh_system_user_create () { - if ! ynh_system_user_exists "$1" # Check if the user exists on the system - then # If the user doesn't exist - if [ $# -ge 2 ]; then # If a home dir is mentioned - user_home_dir="-d $2" - else - user_home_dir="--no-create-home" - fi - sudo useradd $user_home_dir --system --user-group $1 --shell /usr/sbin/nologin || ynh_die "Unable to create $1 system account" - fi -} - -# Delete a system user -# -# usage: ynh_system_user_delete user_name -# | arg: user_name - Name of the system user that will be create -ynh_system_user_delete () { - if ynh_system_user_exists "$1" # Check if the user exists on the system +config_nginx() { + if [ "$path_url" != "/" ] then - echo "Remove the user $1" >&2 - sudo userdel $1 - else - echo "The user $1 was not found" >&2 + ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf" fi + ynh_add_nginx_config } -# Curl abstraction to help with POST requests to local pages (such as installation forms) -# -# $domain and $path_url should be defined externally (and correspond to the domain.tld and the /path (of the app?)) -# -# example: ynh_local_curl "/install.php?installButton" "foo=$var1" "bar=$var2" -# -# usage: ynh_local_curl "page_uri" "key1=value1" "key2=value2" ... -# | arg: page_uri - Path (relative to $path_url) of the page where POST data will be sent -# | arg: key1=value1 - (Optionnal) POST key and corresponding value -# | arg: key2=value2 - (Optionnal) Another POST key and corresponding value -# | arg: ... - (Optionnal) More POST keys and values -ynh_local_curl () { - # Define url of page to curl - full_page_url=https://localhost$path_url$1 - - # Concatenate all other arguments with '&' to prepare POST data - POST_data="" - for arg in "${@:2}" - do - POST_data="${POST_data}${arg}&" - done - if [ -n "$POST_data" ] - then - # Add --data arg and remove the last character, which is an unecessary '&' - POST_data="--data \"${POST_data::-1}\"" - fi - - # Curl the URL - curl --silent --show-error -kL -H "Host: $domain" --resolve $domain:443:127.0.0.1 $POST_data "$full_page_url" +create_dir() { + mkdir -p "$config_path" } -# Substitute/replace a string by another in a file -# -# usage: ynh_replace_string match_string replace_string target_file -# | arg: match_string - String to be searched and replaced in the file -# | arg: replace_string - String that will replace matches -# | arg: target_file - File in which the string will be replaced. -ynh_replace_string () { - delimit=@ - match_string=${1//${delimit}/"\\${delimit}"} # Escape the delimiter if it's in the string. - replace_string=${2//${delimit}/"\\${delimit}"} - workfile=$3 +config_gitlab() { + gitlab_conf_path="$config_path/gitlab.rb" - sudo sed --in-place "s${delimit}${match_string}${delimit}${replace_string}${delimit}g" "$workfile" + ynh_backup_if_checksum_is_different $gitlab_conf_path + + # Gitlab configuration + cp -f ../conf/gitlab.rb $gitlab_conf_path + + ynh_replace_string "__GENERATED_EXTERNAL_URL__" "https://$domain${path_url%/}" $gitlab_conf_path + ynh_replace_string "__PORT__" "$port" $gitlab_conf_path + ynh_replace_string "__PORTUNICORN__" "$portUnicorn" $gitlab_conf_path + + ynh_store_file_checksum $gitlab_conf_path } -# Remove a file or a directory securely -# -# usage: ynh_secure_remove path_to_remove -# | arg: path_to_remove - File or directory to remove -ynh_secure_remove () { - path_to_remove=$1 - forbidden_path=" \ - /var/www \ - /home/yunohost.app" - - if [[ "$forbidden_path" =~ "$path_to_remove" \ - # Match all paths or subpaths in $forbidden_path - || "$path_to_remove" =~ ^/[[:alnum:]]+$ \ - # Match all first level paths from / (Like /var, /root, etc...) - || "${path_to_remove:${#path_to_remove}-1}" = "/" ]] - # Match if the path finishes by /. Because it seems there is an empty variable - then - echo "Avoid deleting $path_to_remove." >&2 - else - if [ -e "$path_to_remove" ] - then - sudo rm -R "$path_to_remove" - else - echo "$path_to_remove wasn't deleted because it doesn't exist." >&2 - fi - fi +remove_config_gitlab() { + ynh_secure_remove "$config_path/gitlab.rb" } -# Download, check integrity, uncompress and patch the source from app.src -# -# The file conf/app.src need to contains: -# -# SOURCE_URL=Address to download the app archive -# SOURCE_SUM=Control sum -# # (Optional) Programm to check the integrity (sha256sum, md5sum$YNH_EXECUTION_DIR/...) -# # default: sha256 -# SOURCE_SUM_PRG=sha256 -# # (Optional) Archive format -# # default: tar.gz -# SOURCE_FORMAT=tar.gz -# # (Optional) Put false if source are directly in the archive root -# # default: true -# SOURCE_IN_SUBDIR=false -# # (Optionnal) Name of the local archive (offline setup support) -# # default: ${src_id}.${src_format} -# SOURCE_FILENAME=example.tar.gz -# -# Details: -# This helper download sources from SOURCE_URL if there is no local source -# archive in /opt/yunohost-apps-src/APP_ID/SOURCE_FILENAME -# -# Next, it check the integrity with "SOURCE_SUM_PRG -c --status" command. -# -# If it's ok, the source archive will be uncompress in $dest_dir. If the -# SOURCE_IN_SUBDIR is true, the first level directory of the archive will be -# removed. -# -# Finally, patches named sources/patches/${src_id}-*.patch and extra files in -# sources/extra_files/$src_id will be applyed to dest_dir -# -# -# usage: ynh_setup_source dest_dir [source_id] -# | arg: dest_dir - Directory where to setup sources -# | arg: source_id - Name of the app, if the package contains more than one app -ynh_setup_source () { - local dest_dir=$1 - local src_id=${2:-app} # If the argument is not given, source_id equal "app" +update_src_version() { + source ./upgrade.d/upgrade.sh + cp ../conf/arm.src.default ../conf/arm.src + ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/arm.src" + ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/arm.src" + + cp ../conf/x86-64.src.default ../conf/x86-64.src + ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/x86-64.src" + ynh_replace_string "__SHA256_SUM__" "$gitlab_x86_64_source_sha256" "../conf/x86-64.src" +} + +setup_source () { + local src_id=${1:-app} # If the argument is not given, source_id equals "app" # Load value from configuration file (see above for a small doc about this file # format) - local src_url=$(grep 'SOURCE_URL=' "../conf/${src_id}.src" | cut -d= -f2-) - local src_sum=$(grep 'SOURCE_SUM=' "../conf/${src_id}.src" | cut -d= -f2-) - local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "../conf/${src_id}.src" | cut -d= -f2-) - local src_format=$(grep 'SOURCE_FORMAT=' "../conf/${src_id}.src" | cut -d= -f2-) - local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "../conf/${src_id}.src" | cut -d= -f2-) - local src_filename=$(grep 'SOURCE_FILENAME=' "../conf/${src_id}.src" | cut -d= -f2-) + local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_sum=$(grep 'SOURCE_SUM=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_extract=$(grep 'SOURCE_EXTRACT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) # Default value src_sumprg=${src_sumprg:-sha256sum} src_in_subdir=${src_in_subdir:-true} src_format=${src_format:-tar.gz} src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]') + src_extract=${src_extract:-true} if [ "$src_filename" = "" ] ; then src_filename="${src_id}.${src_format}" fi @@ -423,237 +90,12 @@ ynh_setup_source () { then # Use the local source file if it is present cp $local_src $src_filename else # If not, download the source - wget -nv -O $src_filename $src_url + local out=`wget -nv -O $src_filename $src_url 2>&1` || ynh_print_err $out fi # Check the control sum echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \ || ynh_die "Corrupt source" - # Extract source into the app dir - sudo mkdir -p "$dest_dir" - if [ "$src_format" = "zip" ] - then - # Zip format - # Using of a temp directory, because unzip doesn't manage --strip-components - if $src_in_subdir ; then - local tmp_dir=$(mktemp -d) - sudo unzip -quo $src_filename -d "$tmp_dir" - sudo cp -a $tmp_dir/*/. "$dest_dir" - ynh_secure_remove "$tmp_dir" - else - sudo unzip -quo $src_filename -d "$dest_dir" - fi - else - local strip="" - if $src_in_subdir ; then - strip="--strip-components 1" - fi - if [[ "$src_format" =~ ^tar.gz|tar.bz2|tar.xz$ ]] ; then - sudo tar -xf $src_filename -C "$dest_dir" $strip - else - ynh_die "Archive format unrecognized." - fi - fi - - # Apply patches - if (( $(find ../sources/patches/ -type f -name "${src_id}-*.patch" 2> /dev/null | wc -l) > "0" )); then - local old_dir=$(pwd) - (cd "$dest_dir" \ - && for p in ../sources/patches/${src_id}-*.patch; do \ - sudo patch -p1 < $p; done) \ - || ynh_die "Unable to apply patches" - cd $old_dir - fi - - # Add supplementary files - if test -e "../sources/extra_files/${src_id}"; then - sudo cp -a ../sources/extra_files/$src_id/. "$dest_dir" - fi -} - -# Check availability of a web path -# -# example: ynh_webpath_available some.domain.tld /coffee -# -# usage: ynh_webpath_available domain path -# | arg: domain - the domain/host of the url -# | arg: path - the web path to check the availability of -ynh_webpath_available () { - local domain=$1 - local path=$2 - sudo yunohost domain url-available $domain $path -} - -# Register/book a web path for an app -# -# example: ynh_webpath_register wordpress some.domain.tld /coffee -# -# usage: ynh_webpath_register app domain path -# | arg: app - the app for which the domain should be registered -# | arg: domain - the domain/host of the web path -# | arg: path - the web path to be registered -ynh_webpath_register () { - local app=$1 - local domain=$2 - local path=$3 - sudo yunohost app register-url $app $domain $path -} - -# Calculate and store a file checksum into the app settings -# -# $app should be defined when calling this helper -# -# usage: ynh_store_file_checksum file -# | arg: file - The file on which the checksum will performed, then stored. -ynh_store_file_checksum () { - local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' - ynh_app_setting_set $app $checksum_setting_name $(sudo md5sum "$1" | cut -d' ' -f1) -} - -# Verify the checksum and backup the file if it's different -# This helper is primarily meant to allow to easily backup personalised/manually -# modified config files. -# -# $app should be defined when calling this helper -# -# usage: ynh_backup_if_checksum_is_different file -# | arg: file - The file on which the checksum test will be perfomed. -# -# | ret: Return the name a the backup file, or nothing -ynh_backup_if_checksum_is_different () { - local file=$1 - local checksum_setting_name=checksum_${file//[\/ ]/_} # Replace all '/' and ' ' by '_' - local checksum_value=$(ynh_app_setting_get $app $checksum_setting_name) - if [ -n "$checksum_value" ] - then # Proceed only if a value was stored into the app settings - if ! echo "$checksum_value $file" | sudo md5sum -c --status - then # If the checksum is now different - backup_file="/home/yunohost.conf/backup/$file.backup.$(date '+%Y%m%d.%H%M%S')" - sudo mkdir -p "$(dirname "$backup_file")" - sudo cp -a "$file" "$backup_file" # Backup the current file - echo "File $file has been manually modified since the installation or last upgrade. So it has been duplicated in $backup_file" >&2 - echo "$backup_file" # Return the name of the backup file - fi - fi -} - -##################################### - -# This is not an official helper, just an abstract helper to prepare to the new one. -ynh_restore_file () { - sudo cp -a "${backup_dir}$1" "$1" -} - -# ============================================================================= -# YUNOHOST 2.6 FORTHCOMING HELPERS -# (will be part of YunoHost 2.6, so won't be necessary any more after -# YunoHost 2.6 gets widespread) -# ============================================================================= - -# Create a dedicated nginx config -# -# usage: ynh_add_nginx_config -ynh_add_nginx_config () { - finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf" - ynh_backup_if_checksum_is_different "$finalnginxconf" 1 - sudo cp ../conf/nginx.conf "$finalnginxconf" - - # To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable. - # Substitute in a nginx config file only if the variable is not empty - if test -n "${path_url:-}"; then - ynh_replace_string "__PATH__" "$path_url" "$finalnginxconf" - fi - if test -n "${domain:-}"; then - ynh_replace_string "__DOMAIN__" "$domain" "$finalnginxconf" - fi - if test -n "${port:-}"; then - ynh_replace_string "__PORT__" "$port" "$finalnginxconf" - fi - if test -n "${app:-}"; then - ynh_replace_string "__NAME__" "$app" "$finalnginxconf" - fi - if test -n "${final_path:-}"; then - ynh_replace_string "__FINALPATH__" "$final_path" "$finalnginxconf" - fi - ynh_store_checksum_config "$finalnginxconf" - - sudo systemctl reload nginx -} - -# Remove the dedicated nginx config -# -# usage: ynh_remove_nginx_config -ynh_remove_nginx_config () { - ynh_secure_remove "/etc/nginx/conf.d/$domain.d/$app.conf" - sudo systemctl reload nginx -} - -# Create a dedicated php-fpm config -# -# usage: ynh_add_fpm_config -ynh_add_fpm_config () { - finalphpconf="/etc/php5/fpm/pool.d/$app.conf" - ynh_backup_if_checksum_is_different "$finalphpconf" 1 - sudo cp ../conf/php-fpm.conf "$finalphpconf" - ynh_replace_string "__NAMETOCHANGE__" "$app" "$finalphpconf" - ynh_replace_string "__FINALPATH__" "$final_path" "$finalphpconf" - ynh_replace_string "__USER__" "$app" "$finalphpconf" - sudo chown root: "$finalphpconf" - ynh_store_file_checksum "$finalphpconf" - - if [ -e "../conf/php-fpm.ini" ] - then - finalphpini="/etc/php5/fpm/conf.d/20-$app.ini" - ynh_compare_checksum_config "$finalphpini" 1 - sudo cp ../conf/php-fpm.ini "$finalphpini" - sudo chown root: "$finalphpini" - ynh_store_checksum_config "$finalphpini" - fi - - sudo systemctl reload php5-fpm -} - -# Remove the dedicated php-fpm config -# -# usage: ynh_remove_fpm_config -ynh_remove_fpm_config () { - ynh_secure_remove "/etc/php5/fpm/pool.d/$app.conf" - ynh_secure_remove "/etc/php5/fpm/conf.d/20-$app.ini" 2>&1 - sudo systemctl reload php5-fpm -} - -# Create a dedicated systemd config -# -# usage: ynh_add_systemd_config -ynh_add_systemd_config () { - finalsystemdconf="/etc/systemd/system/$app.service" - ynh_compare_checksum_config "$finalsystemdconf" 1 - sudo cp ../conf/systemd.service "$finalsystemdconf" - - # To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable. - # Substitute in a nginx config file only if the variable is not empty - if test -n "${final_path:-}"; then - ynh_replace_string "__FINALPATH__" "$final_path" "$finalsystemdconf" - fi - if test -n "${app:-}"; then - ynh_replace_string "__APP__" "$app" "$finalsystemdconf" - fi - ynh_store_checksum_config "$finalsystemdconf" - - sudo chown root: "$finalsystemdconf" - sudo systemctl enable $app - sudo systemctl daemon-reload -} - -# Remove the dedicated systemd config -# -# usage: ynh_remove_systemd_config -ynh_remove_systemd_config () { - finalsystemdconf="/etc/systemd/system/$app.service" - if [ -e "$finalsystemdconf" ]; then - sudo systemctl stop $app - sudo systemctl disable $app - ynh_secure_remove "$finalsystemdconf" - fi + dpkg -i $src_filename } \ No newline at end of file diff --git a/scripts/change_url b/scripts/change_url index c528fd6..926cf60 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,14 +1,17 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu - #================================================= +# GENERIC START +#================================================= + # IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +# Import common cmd +source ./_common.sh #================================================= # RETRIEVE ARGUMENTS #================================================= @@ -21,8 +24,8 @@ new_path=$YNH_APP_NEW_PATH app=$YNH_APP_INSTANCE_NAME -portNginx=$(ynh_find_port 8080) -portUnicorn=$(ynh_find_port 9080) +port=$(ynh_app_setting_get "$app" web_port) +portUnicorn=$(ynh_app_setting_get "$app" unicorn_port) #================================================= # CHECK PATHS SYNTAX @@ -33,9 +36,9 @@ test -n "$new_path" || new_path="/" new_path=$(ynh_normalize_url_path $new_path) old_path=$(ynh_normalize_url_path $old_path) -# Check domain/path availability -sudo yunohost app checkurl "${new_domain}${new_path}" -a "$app" \ - || ynh_die "Path not available: ${new_domain}${new_path}" +domain="$new_domain" +path_url="$new_path" + #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED @@ -63,24 +66,22 @@ if [ $change_path -eq 1 ] then sudo gitlab-ctl stop unicorn sudo gitlab-ctl stop sidekiq - - ynh_replace_string "location ${old_path%/}/" "location ${new_path%/}/" "$nginx_conf_path" - - ynh_replace_string "https://$old_domain${old_path%/}" "https://$old_domain${new_path%/}" "$gitlab_conf_path" fi # Change the domain for nginx if [ $change_domain -eq 1 ] then - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - - ynh_replace_string "https://$old_domain" "https://$new_domain" "$gitlab_conf_path" + # Delete file checksum for the old conf file location + ynh_delete_file_checksum "$nginx_conf_path" + + ynh_secure_remove "$nginx_conf_path" fi -if [ $change_domain -eq 1 ] || [ $change_path -eq 1 ] -then - sudo gitlab-ctl reconfigure -fi +config_nginx + +config_gitlab + +sudo gitlab-ctl reconfigure if [ $change_path -eq 1 ] then diff --git a/scripts/install b/scripts/install index b83b174..3bd3d5d 100644 --- a/scripts/install +++ b/scripts/install @@ -1,19 +1,17 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu +#================================================= +# GENERIC START +#================================================= -# This is a multi-instance app, meaning it can be installed several times independently -# The id of the app as stated in the manifest is available as $YNH_APP_ID -# The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) -# The app instance name is available as $YNH_APP_INSTANCE_NAME -# - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample -# - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 -# - ynhexample__{N} for the subsequent installations, with N=3,4, ... -# The app instance name is probably what you are interested the most, since this is -# guaranteed to be unique. This is a good unique identifier to define installation path, -# db names, ... -app=$YNH_APP_INSTANCE_NAME +# IMPORT GENERIC HELPERS +source /usr/share/yunohost/helpers + +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +# Load common variables and helpers +source ./_common.sh # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN @@ -21,42 +19,46 @@ path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN -# Source YunoHost helpers -source /usr/share/yunohost/helpers +# Check domain/path availability +ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain." +ynh_webpath_register $app $domain $path_url -# Save app settings -ynh_app_setting_set "$app" is_public "$is_public" +# Check user parameter +ynh_user_exists "$admin" \ + || ynh_die "The chosen admin user does not exist." mailadmin=$(ynh_user_get_info $admin mail) -portNginx=$(ynh_find_port 8080) +port=$(ynh_find_port 8080) portUnicorn=$(ynh_find_port 9080) rdmPass=$(ynh_string_random 30) -# Check domain/path availability -sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \ - || ynh_die "Path not available: ${domain}${path_url}" +# Save app settings +ynh_app_setting_set $app admin $admin +ynh_app_setting_set $app path_url $path_url +ynh_app_setting_set $app is_public $is_public +ynh_app_setting_set $app web_port $port +ynh_app_setting_set $app unicorn_port $portUnicorn +#================================================= +# STANDARD MODIFICATIONS +#================================================= -# Add gitlab repository -sudo apt-get install -yy curl openssh-server ca-certificates postfix apt-transport-https -curl -L https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey | sudo apt-key add - -sudo apt-get update -sudo apt-get install -yy debian-archive-keyring -sudo cp ../conf/gitlab-ce.list /etc/apt/sources.list.d/gitlab-ce.list -sudo apt-get update -sudo apt-get install -yy gitlab-ce +# Modify Nginx configuration file and copy it to Nginx conf directory +config_nginx +create_dir -# Gitlab configuration +# Configure gitlab with gitlab.rb file +config_gitlab -gitlab_conf_path=../conf/gitlab.rb -ynh_replace_string "GENERATED_EXTERNAL_URL" "https://$domain${path_url%/}" $gitlab_conf_path -ynh_replace_string "PORTNGINX" "$portNginx" $gitlab_conf_path -ynh_replace_string "PORTUNICORN" "$portUnicorn" $gitlab_conf_path +# Add dependencies +ynh_install_app_dependencies openssh-server -sudo cp -f ../conf/gitlab.rb /etc/gitlab/gitlab.rb -sudo gitlab-ctl reconfigure +# Update to the last version +update_src_version +# Install gitlab +setup_source $architecture echo "newuser = User.new({ \"email\"=>'$mailadmin', \"username\"=>'$admin', \"name\"=>'$admin', \"password\"=>'$rdmPass'}) newuser.admin = true @@ -66,21 +68,16 @@ newuser.save" | sudo gitlab-rails console sudo gitlab-ctl reconfigure -# Modify Nginx configuration file and copy it to Nginx conf directory -nginx_conf=../conf/nginx.conf - -ynh_replace_string "YNH_WWW_PATH" "${path_url%/}/" $nginx_conf -ynh_replace_string "PORT" "$portNginx" $nginx_conf -sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf - - # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # unprotected_uris allows SSO credentials to be passed anyway. ynh_app_setting_set "$app" unprotected_uris "/" fi +# Configure logrotate +#ynh_use_logrotate "/var/log/$app" + # Reload services -sudo yunohost app ssowatconf -sudo service nginx reload -sudo gitlab-ctl restart +#sudo yunohost app ssowatconf +#sudo service nginx reload +#sudo gitlab-ctl restart diff --git a/scripts/remove b/scripts/remove index 886e3c5..c31d493 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,27 +1,32 @@ #!/bin/bash set -u + # See comments in install script app=$YNH_APP_INSTANCE_NAME # Source YunoHost helpers source /usr/share/yunohost/helpers -# Retrieve app settings -domain=$(ynh_app_setting_get "$app" domain) +# Load common variables and helpers +source ./_common.sh -sudo apt-get -yy remove gitlab-ce +# Remove gitlab +dpkg --remove gitlab-ce -sudo rm -rf /opt/gitlab -sudo rm -rf /etc/gitlab -sudo rm -rf /var/opt/gitlab +# Remove Config +remove_config_gitlab -# Remove apt sources-list -sudo rm -f /etc/apt/sources.list.d/gitlab-ce.list +# Remove dependencies +ynh_remove_app_dependencies + +# Remove a directory securely +ynh_secure_remove "/etc/$app" +ynh_secure_remove "/opt/$app" +ynh_secure_remove "/var/opt/$app" + +# Remove the log files +ynh_secure_remove "/var/log/$app" # Remove nginx configuration file -sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf - - -# Reload nginx service -sudo service nginx reload +ynh_remove_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index ec7e8f1..c8d5123 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,40 +1,41 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu - -# See comments in install script -app=$YNH_APP_INSTANCE_NAME - # Source YunoHost helpers source /usr/share/yunohost/helpers +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +# Load common variables and helpers +source ./_common.sh + +# See comments in install script +app=$YNH_APP_INSTANCE_NAME + # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path_url) admin=$(ynh_app_setting_get "$app" admin) is_public=$(ynh_app_setting_get "$app" is_public) - -portNginx=$(ynh_find_port 8080) -portUnicorn=$(ynh_find_port 9080) - -# Gitlab configuration -gitlab_conf_path=../conf/gitlab.rb -ynh_replace_string "GENERATED_EXTERNAL_URL" "https://$domain${path_url%/}" $gitlab_conf_path -ynh_replace_string "PORTNGINX" "$portNginx" $gitlab_conf_path -ynh_replace_string "PORTUNICORN" "$portUnicorn" $gitlab_conf_path - -sudo cp -f ../conf/gitlab.rb /etc/gitlab/gitlab.rb +port=$(ynh_app_setting_get "$app" web_port) +portUnicorn=$(ynh_app_setting_get "$app" unicorn_port) # Modify Nginx configuration file and copy it to Nginx conf directory -nginx_conf=../conf/nginx.conf +config_nginx -ynh_replace_string "YNH_WWW_PATH" "${path_url%/}/" $nginx_conf -ynh_replace_string "PORT" "$portNginx" $nginx_conf -sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +create_dir -sudo apt-get update -sudo apt-get install -yy gitlab-ce +# Configure gitlab with gitlab.rb file +config_gitlab + +# Add dependencies +ynh_install_app_dependencies openssh-server + +# Update to the last version +update_src_version + +# Update Gitlab +setup_source $architecture # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then From 6cb6e5827c6a4fabe074d15d43a7253d8711c54c Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 17 Dec 2018 00:10:07 +0100 Subject: [PATCH 13/40] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 0b4ae06..f5861eb 100644 --- a/manifest.json +++ b/manifest.json @@ -36,8 +36,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for gitlab only / is accepted", - "fr": "Choisissez un chemin pour gitlab seulement / est accepté" + "en": "Choose a path for gitlab", + "fr": "Choisissez un chemin pour gitlab" }, "example": "/", "default": "/" From 1d2d9e0f6d62e4f7e76d8a18f95f32c46c6fc6d2 Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 17 Dec 2018 10:44:21 +0100 Subject: [PATCH 14/40] Delete app.src --- conf/app.src | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index cc2d6c7..0000000 --- a/conf/app.src +++ /dev/null @@ -1,2 +0,0 @@ -SOURCE_URL=url of app's source -SOURCE_SUM=md5 or sha1 checksum From 1bcabda97aa844b4467b9f39c50866c38de54061 Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 17 Dec 2018 10:44:34 +0100 Subject: [PATCH 15/40] Delete php-fpm.conf --- conf/php-fpm.conf | 251 ---------------------------------------------- 1 file changed, 251 deletions(-) delete mode 100644 conf/php-fpm.conf diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 2061166..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,251 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[YNH_WWW_APP] - -; Per pool prefix -; It only applies on the following directives: -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php5-fpm-YNH_WWW_APP.sock - -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = -1 - -; List of ipv4 addresses of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0666 -listen.owner = www-data -listen.group = www-data -listen.mode = 0600 - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives: -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes to be created when pm is set to 'dynamic'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. -; Note: Used when pm is set to either 'static' or 'dynamic' -; Note: This value is mandatory. -pm.max_children = 6 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 3 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 3 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 5 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. By default, the status page shows the following -; information: -; accepted conn - the number of request accepted by the pool; -; pool - the name of the pool; -; process manager - static or dynamic; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes. -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic') -; The values of 'idle processes', 'active processes' and 'total processes' are -; updated each second. The value of 'accepted conn' is updated in real time. -; Example output: -; accepted conn: 12073 -; pool: www -; process manager: static -; idle processes: 35 -; active processes: 65 -; total processes: 100 -; max children reached: 1 -; By default the status page output is formatted as text/plain. Passing either -; 'html' or 'json' as a query string will return the corresponding output -; syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -pm.status_path = /fpm-status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 120s - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_slowlog_timeout = 5s - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/YNH_WWW_APP.slow.log - -; Set open file descriptor rlimit. -; Default Value: system defined value -rlimit_files = 4096 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = /var/www/YNH_WWW_ALIAS - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -# Common values to change to increase file upload limit -;php_value[upload_max_filesize] = 50M -;php_value[post_max_size] = 50M -;php_value[mail.add_x_header] = Off - -# Other common parameters -;php_value[max_execution_time] = 600 -;php_value[max_input_time] = 300 -;php_value[memory_limit] = 256M -;php_value[short_open_tag] = On - From b0f3e78836634023cbeb94337b6cdd5f1c96caac Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 17 Dec 2018 10:44:45 +0100 Subject: [PATCH 16/40] Delete gitlab-ce.list --- conf/gitlab-ce.list | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 conf/gitlab-ce.list diff --git a/conf/gitlab-ce.list b/conf/gitlab-ce.list deleted file mode 100644 index 779e04a..0000000 --- a/conf/gitlab-ce.list +++ /dev/null @@ -1,2 +0,0 @@ -deb https://packages.gitlab.com/gitlab/gitlab-ce/debian/ jessie main -deb-src https://packages.gitlab.com/gitlab/gitlab-ce/debian/ jessie main From 84feb023d835ead8da3cfae9d5a5e91926f5e8db Mon Sep 17 00:00:00 2001 From: Bourre Pierre Date: Mon, 17 Dec 2018 12:45:00 +0100 Subject: [PATCH 17/40] Update Readme --- README.md | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 60a1f4a..c23ab43 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,65 @@ # Gitlab for Yunohost -- [Yunohost project](https://yunohost.org) -- [gitlab website](https://gitlab.com) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://ci-apps.yunohost.org/jenkins/job/gitlab%20%28Community%29/lastBuild/consoleFull) +[![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) -Gitlab is a git server similar to github. +> *This package allow you to install gitlab quickly and simply on a YunoHost server. +If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* -**Upgrade this package:** -`sudo yunohost app upgrade --verbose gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh` +## Overview -**Multi-user:** Yes with LDAP support. +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:** 1.5.3 + +## Screenshots + +![](https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/GitLab_running_11.0_%282018-07%29.png/300px-GitLab_running_11.0_%282018-07%29.png) + +## Configuration + +How to configure this app: by an admin panel + +## Documentation + + * Official documentation: https://docs.gitlab.com/ce/README.html + +## YunoHost specific features + +#### Multi-users support + +Yes with LDAP support. + +#### Supported architectures + +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/gitlab%20(Community)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/gitlab%20(Community)/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/gitlab%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/gitlab%20(Community)%20(%7EARM%7E)/) +* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/gitlab%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/gitlab%20(Community)/) + +## Limitations + +* Not compatible with a 32-bit architecture. + +**More information on the documentation page:** +https://yunohost.org/packaging_apps + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/gitlab_ynh/issues + * App website: https://gitlab.com + * YunoHost website: https://yunohost.org/ + +--- + +Developers info +---------------- + +**Only if you want to use a testing branch for coding, instead of merging directly into master.** +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +or +sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +``` From d30c13d9b6eccaef8162599156cfa311be289218 Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 17 Dec 2018 18:36:20 +0100 Subject: [PATCH 18/40] Update LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 657 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 03cfbb8..0ad25db 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,661 @@ -The MIT License (MIT) + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -Copyright GitLab B.V. + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Preamble -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From a582665596af150a3a1037f63bdd01bfd5faf114 Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 17 Dec 2018 19:37:44 +0100 Subject: [PATCH 19/40] ynh_webpath_available is redundant --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3bd3d5d..2e9a371 100644 --- a/scripts/install +++ b/scripts/install @@ -20,7 +20,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN # Check domain/path availability -ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain." ynh_webpath_register $app $domain $path_url # Check user parameter From 0b52ed7eb3edc8735b728dfe8d7b4dee90476bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Wed, 19 Dec 2018 00:02:20 +0100 Subject: [PATCH 20/40] Open Ports and add sections --- scripts/_common.sh | 30 ++++++++++++++- scripts/change_url | 42 +++++++++++++++++--- scripts/install | 96 ++++++++++++++++++++++++++++++++++++---------- scripts/remove | 69 ++++++++++++++++++++++++++++----- scripts/upgrade | 70 ++++++++++++++++++++++++++++----- 5 files changed, 260 insertions(+), 47 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4da342f..4cd71f3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,10 @@ app=$YNH_APP_INSTANCE_NAME config_path="/etc/$app" final_path="/opt/$app" -# Detect the system architecture to download the right tarball +#================================================= +# DETECT THE SYSTEM ARCHITECTURE +#================================================= +# Detect the system architecture to download the right file # NOTE: `uname -m` is more accurate and universal than `arch` # See https://en.wikipedia.org/wiki/Uname if [ -n "$(uname -m | grep 64)" ]; then @@ -20,6 +23,9 @@ else your hardware and the result of the command \"uname -m\"." 1 fi +#================================================= +# CONFIGURE NGINX +#================================================= config_nginx() { if [ "$path_url" != "/" ] then @@ -28,11 +34,19 @@ config_nginx() { ynh_add_nginx_config } +#================================================= +# CREATE FOLDERS +#================================================= create_dir() { mkdir -p "$config_path" } +#================================================= +# CONFIGURATION FILE FOR GITLAB +#================================================= config_gitlab() { + create_dir + gitlab_conf_path="$config_path/gitlab.rb" ynh_backup_if_checksum_is_different $gitlab_conf_path @@ -47,10 +61,16 @@ config_gitlab() { ynh_store_file_checksum $gitlab_conf_path } +#================================================= +# REMOVE THE CONFIGURATION FILE FOR GITLAB +#================================================= remove_config_gitlab() { ynh_secure_remove "$config_path/gitlab.rb" } +#================================================= +# UPDATE SOURCES FILES +#================================================= update_src_version() { source ./upgrade.d/upgrade.sh cp ../conf/arm.src.default ../conf/arm.src @@ -62,9 +82,15 @@ update_src_version() { ynh_replace_string "__SHA256_SUM__" "$gitlab_x86_64_source_sha256" "../conf/x86-64.src" } -setup_source () { +#================================================= +# INSTALL GITLAB +#================================================= +# This function is inspired by the ynh_setup_source function, adapted to deal with .deb files +setup_source() { local src_id=${1:-app} # If the argument is not given, source_id equals "app" + update_src_version # Update source file + # Load value from configuration file (see above for a small doc about this file # format) local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) diff --git a/scripts/change_url b/scripts/change_url index 926cf60..9347400 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -3,6 +3,8 @@ #================================================= # GENERIC START #================================================= +# IMPORT GENERIC HELPERS +#================================================= # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers @@ -12,6 +14,7 @@ ynh_abort_if_errors # Import common cmd source ./_common.sh + #================================================= # RETRIEVE ARGUMENTS #================================================= @@ -24,6 +27,10 @@ new_path=$YNH_APP_NEW_PATH app=$YNH_APP_INSTANCE_NAME +#================================================= +# LOAD SETTINGS +#================================================= + port=$(ynh_app_setting_get "$app" web_port) portUnicorn=$(ynh_app_setting_get "$app" unicorn_port) @@ -39,7 +46,6 @@ old_path=$(ynh_normalize_url_path $old_path) domain="$new_domain" path_url="$new_path" - #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= @@ -56,28 +62,44 @@ then change_path=1 fi +#================================================= +# STANDARD MODIFICATIONS +#================================================= +# MODIFY URL IN NGINX +#================================================= + #doc in: https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab # Gitlab configuration nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -gitlab_conf_path=/etc/gitlab/gitlab.rb if [ $change_path -eq 1 ] then sudo gitlab-ctl stop unicorn sudo gitlab-ctl stop sidekiq + + # Make a backup of the original nginx config file if modified + ynh_backup_if_checksum_is_different "$nginx_conf_path" + # Set global variables for nginx helper + domain="$old_domain" + path_url="$new_path" + # Create a dedicated nginx config + config_nginx fi # Change the domain for nginx if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location - ynh_delete_file_checksum "$nginx_conf_path" - - ynh_secure_remove "$nginx_conf_path" + ynh_delete_file_checksum "$nginx_conf_path" + mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + # Store file checksum for the new config file location + ynh_store_file_checksum "/etc/nginx/conf.d/$new_domain.d/$app.conf" fi -config_nginx +#================================================= +# CONFIGURE GITLAB +#================================================= config_gitlab @@ -87,3 +109,11 @@ if [ $change_path -eq 1 ] then sudo gitlab-ctl restart fi + +#================================================= +# GENERIC FINALISATION +#================================================= +# RELOAD NGINX +#================================================= + +service nginx reload \ No newline at end of file diff --git a/scripts/install b/scripts/install index 2e9a371..a42ae1f 100644 --- a/scripts/install +++ b/scripts/install @@ -3,8 +3,9 @@ #================================================= # GENERIC START #================================================= - # IMPORT GENERIC HELPERS +#================================================= + source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script @@ -13,70 +14,125 @@ ynh_abort_if_errors # Load common variables and helpers source ./_common.sh +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN -# Check domain/path availability +#================================================= +# REGISTER DOMAIN +#================================================= + +# Normalize the url path syntax +path_url=$(ynh_normalize_url_path $path_url) + +# This function check also the availability of this one ynh_webpath_register $app $domain $path_url +#================================================= +# REGISTER DOMAIN +#================================================= + # Check user parameter ynh_user_exists "$admin" \ || ynh_die "The chosen admin user does not exist." -mailadmin=$(ynh_user_get_info $admin mail) -port=$(ynh_find_port 8080) -portUnicorn=$(ynh_find_port 9080) -rdmPass=$(ynh_string_random 30) +#================================================= +# STORE SETTINGS FROM MANIFEST +#================================================= -# Save app settings ynh_app_setting_set $app admin $admin ynh_app_setting_set $app path_url $path_url ynh_app_setting_set $app is_public $is_public -ynh_app_setting_set $app web_port $port -ynh_app_setting_set $app unicorn_port $portUnicorn #================================================= # STANDARD MODIFICATIONS #================================================= +# FIND AND OPEN PORTS +#================================================= -# Modify Nginx configuration file and copy it to Nginx conf directory +# Find free ports +port=$(ynh_find_port 8080) +portUnicorn=$(ynh_find_port 9080) + +yunohost firewall allow --no-upnp TCP $port 2>&1 +yunohost firewall allow --no-upnp TCP $portUnicorn 2>&1 +ynh_app_setting_set $app web_port $port +ynh_app_setting_set $app unicorn_port $portUnicorn + +#================================================= +# NGINX CONFIGURATION +#================================================= + +# Create a dedicated nginx config config_nginx -create_dir +#================================================= +# CONFIGURE GITLAB +#================================================= # Configure gitlab with gitlab.rb file config_gitlab -# Add dependencies +#================================================= +# INSTALL DEPENDENCIES +#================================================= + ynh_install_app_dependencies openssh-server -# Update to the last version -update_src_version +#================================================= +# DOWNLOAD, CHECK AND INSTALL GITLAB +#================================================= -# Install gitlab setup_source $architecture +#================================================= +# SPECIFIC SETUP +#================================================= +# GETTING ADMIN INFO AND ADD AS A GITLAB USER +#================================================= + +mailadmin=$(ynh_user_get_info $admin mail) +rdmPass=$(ynh_string_random 30) + echo "newuser = User.new({ \"email\"=>'$mailadmin', \"username\"=>'$admin', \"name\"=>'$admin', \"password\"=>'$rdmPass'}) newuser.admin = true newuser.confirmed_at = Time.now newuser.confirmation_token = nil newuser.save" | sudo gitlab-rails console +#================================================= +# RESTART TO TAKE INTO ACCOUNT CHANGES +#================================================= + sudo gitlab-ctl reconfigure +#================================================= +# SETUP SSOWAT +#================================================= + # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # unprotected_uris allows SSO credentials to be passed anyway. ynh_app_setting_set "$app" unprotected_uris "/" fi +#================================================= +# GENERIC FINALISATION +#================================================= +# RELOAD NGINX +#================================================= + +service nginx reload + +#================================================= +# SETUP LOGROTATE +#================================================= + # Configure logrotate #ynh_use_logrotate "/var/log/$app" - -# Reload services -#sudo yunohost app ssowatconf -#sudo service nginx reload -#sudo gitlab-ctl restart diff --git a/scripts/remove b/scripts/remove index c31d493..7e63ab1 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,9 +1,10 @@ #!/bin/bash -set -u - -# See comments in install script -app=$YNH_APP_INSTANCE_NAME +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= # Source YunoHost helpers source /usr/share/yunohost/helpers @@ -11,22 +12,72 @@ source /usr/share/yunohost/helpers # Load common variables and helpers source ./_common.sh +#================================================= +# LOAD SETTINGS +#================================================= + +# See comments in install script +app=$YNH_APP_INSTANCE_NAME +port=$(ynh_app_setting_get "$app" web_port) +portUnicorn=$(ynh_app_setting_get "$app" unicorn_port) + +#================================================= +# STANDARD REMOVE +#================================================= +# REMOVE GITLAB +#================================================= + # Remove gitlab dpkg --remove gitlab-ce +#================================================= +# REMOVE CONF GILE +#================================================= + # Remove Config remove_config_gitlab -# Remove dependencies +#================================================= +# REMOVE DEPENDENCIES +#================================================= + ynh_remove_app_dependencies -# Remove a directory securely -ynh_secure_remove "/etc/$app" -ynh_secure_remove "/opt/$app" +#================================================= +# REMOVE APP MAIN DIR +#================================================= + +ynh_secure_remove "$final_path" +ynh_secure_remove "$config_path" ynh_secure_remove "/var/opt/$app" # Remove the log files ynh_secure_remove "/var/log/$app" -# Remove nginx configuration file +#================================================= +# CLOSE PORTS +#================================================= + +if yunohost firewall list | grep -q "\- $port$" +then + echo "Close port $port" >&2 + yunohost firewall disallow TCP $port 2>&1 +fi + +if yunohost firewall list | grep -q "\- $portUnicorn$" +then + echo "Close port $portUnicorn" >&2 + yunohost firewall disallow TCP $portUnicorn 2>&1 +fi + +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= + ynh_remove_nginx_config + +#================================================= +# REMOVE LOGROTATE CONFIGURATION +#================================================= + +#ynh_remove_logrotate \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index c8d5123..e0b662d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,15 +1,21 @@ #!/bin/bash -# Source YunoHost helpers -source /usr/share/yunohost/helpers +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors +# IMPORT GENERIC HELPERS +source /usr/share/yunohost/helpers # Load common variables and helpers source ./_common.sh -# See comments in install script +#================================================= +# LOAD SETTINGS +#================================================= + app=$YNH_APP_INSTANCE_NAME # Retrieve app settings @@ -20,28 +26,72 @@ is_public=$(ynh_app_setting_get "$app" is_public) port=$(ynh_app_setting_get "$app" web_port) portUnicorn=$(ynh_app_setting_get "$app" unicorn_port) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= + +# TODO: Backup and Restore Scripts +## Backup the current version of the app +#ynh_backup_before_upgrade +#ynh_clean_setup () { +# # restore it if the upgrade fails +# ynh_restore_upgradebackup +#} + +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# CHECK THE PATH +#================================================= + +# Normalize the URL path syntax +path_url=$(ynh_normalize_url_path $path_url) + +#================================================= +# STANDARD UPGRADE STEPS +#================================================= +# NGINX CONFIGURATION +#================================================= + # Modify Nginx configuration file and copy it to Nginx conf directory config_nginx -create_dir +#================================================= +# CONFIGURE GITLAB +#================================================= # Configure gitlab with gitlab.rb file config_gitlab -# Add dependencies +#================================================= +# UPGRADE DEPENDENCIES +#================================================= + ynh_install_app_dependencies openssh-server -# Update to the last version -update_src_version +#================================================= +# DOWNLOAD, CHECK AND INSTALL GITLAB +#================================================= # Update Gitlab setup_source $architecture +#================================================= +# GENERIC FINALIZATION +#================================================= +# SETUP SSOWAT +#================================================= + # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # See install script ynh_app_setting_set "$app" unprotected_uris "/" fi +#================================================= +# RELOAD NGINX +#================================================= + # Reload nginx service -sudo service nginx reload +service nginx reload From 7422d5742e7bd18e421f272745a6d7e91465413d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Wed, 19 Dec 2018 00:34:06 +0100 Subject: [PATCH 21/40] Fix Nginx problem --- conf/nginx.conf | 1 - scripts/_common.sh | 13 +------------ scripts/change_url | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2802c89..e462a9c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,3 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { proxy_pass http://localhost:__PORT__; proxy_set_header Host $host; diff --git a/scripts/_common.sh b/scripts/_common.sh index 4cd71f3..7d7908f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -23,17 +23,6 @@ else your hardware and the result of the command \"uname -m\"." 1 fi -#================================================= -# CONFIGURE NGINX -#================================================= -config_nginx() { - if [ "$path_url" != "/" ] - then - ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf" - fi - ynh_add_nginx_config -} - #================================================= # CREATE FOLDERS #================================================= @@ -46,7 +35,7 @@ create_dir() { #================================================= config_gitlab() { create_dir - + gitlab_conf_path="$config_path/gitlab.rb" ynh_backup_if_checksum_is_different $gitlab_conf_path diff --git a/scripts/change_url b/scripts/change_url index 9347400..d72a000 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -84,7 +84,7 @@ then domain="$old_domain" path_url="$new_path" # Create a dedicated nginx config - config_nginx + ynh_add_nginx_config fi # Change the domain for nginx diff --git a/scripts/install b/scripts/install index a42ae1f..ede2903 100644 --- a/scripts/install +++ b/scripts/install @@ -70,7 +70,7 @@ ynh_app_setting_set $app unicorn_port $portUnicorn #================================================= # Create a dedicated nginx config -config_nginx +ynh_add_nginx_config #================================================= # CONFIGURE GITLAB diff --git a/scripts/upgrade b/scripts/upgrade index e0b662d..3aff0f0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,7 +55,7 @@ path_url=$(ynh_normalize_url_path $path_url) #================================================= # Modify Nginx configuration file and copy it to Nginx conf directory -config_nginx +ynh_add_nginx_config #================================================= # CONFIGURE GITLAB From 8ea9a42380364f6bdbd8775c6da462114a918533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Wed, 19 Dec 2018 00:48:27 +0100 Subject: [PATCH 22/40] Fix remove nginx config --- scripts/remove | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/remove b/scripts/remove index 7e63ab1..3094617 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,6 +18,7 @@ source ./_common.sh # See comments in install script app=$YNH_APP_INSTANCE_NAME +domain=$(ynh_app_setting_get "$app" domain) port=$(ynh_app_setting_get "$app" web_port) portUnicorn=$(ynh_app_setting_get "$app" unicorn_port) From f8010caeb4499bdea244417c72a8f4d9e13c945e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Mon, 24 Dec 2018 16:25:32 +0100 Subject: [PATCH 23/40] add only_ldap option and upgrade to 1.6.0 --- manifest.json | 13 ++++++++++--- scripts/install | 7 +++++-- scripts/upgrade.d/upgrade.sh | 6 +++--- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index f5861eb..5a8da2f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "1.5.3~ynh1", + "version": "1.6.0~ynh1", "description": { "en": "Gitlab for Yunohost.", "fr": "Gitlab pour YunoHost." @@ -59,9 +59,16 @@ "fr": "Est-ce une application publique ?" }, "default": true + }, + { + "name": "only_use_ldap", + "type": "boolean", + "ask": { + "en": "Use only Yunohost account to sign in?", + "fr": "Utiliser seulement les comptes Yunohost pour se connecter ?" + }, + "default": true } - - ] } } diff --git a/scripts/install b/scripts/install index ede2903..5b5ebf8 100644 --- a/scripts/install +++ b/scripts/install @@ -22,6 +22,7 @@ source ./_common.sh domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC +only_use_ldap=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN #================================================= @@ -49,6 +50,7 @@ ynh_user_exists "$admin" \ ynh_app_setting_set $app admin $admin ynh_app_setting_set $app path_url $path_url ynh_app_setting_set $app is_public $is_public +ynh_app_setting_set $app only_use_ldap $only_use_ldap #================================================= # STANDARD MODIFICATIONS @@ -94,7 +96,7 @@ setup_source $architecture #================================================= # SPECIFIC SETUP #================================================= -# GETTING ADMIN INFO AND ADD AS A GITLAB USER +# GETTING ADMIN INFO AND ADD AS A GITLAB USER AND CONFIGURE SIGN IN SYSTEM #================================================= mailadmin=$(ynh_user_get_info $admin mail) @@ -104,7 +106,8 @@ echo "newuser = User.new({ \"email\"=>'$mailadmin', \"username\"=>'$admin', \"na newuser.admin = true newuser.confirmed_at = Time.now newuser.confirmation_token = nil -newuser.save" | sudo gitlab-rails console +newuser.save +ApplicationSetting.last.update_attributes(password_authentication_enabled_for_web: $only_use_ldap, signup_enabled: $only_use_ldap)" | sudo gitlab-rails console #================================================= # RESTART TO TAKE INTO ACCOUNT CHANGES diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh index fb6ccf7..57396a8 100644 --- a/scripts/upgrade.d/upgrade.sh +++ b/scripts/upgrade.d/upgrade.sh @@ -1,5 +1,5 @@ -gitlab_version="11.5.3" +gitlab_version="11.6.0" -gitlab_x86_64_source_sha256="fdbea3e92eb1f613897659e99b20660d64524eaf5b1cd57a323cd6f61c573e7f" +gitlab_x86_64_source_sha256="040ac5917d71c45b3fbdeccbeaf2e7b3181fcce0ed9ca65ac68d3d15081b8b02" -gitlab_arm_source_sha256="81d37736442be80d687b52299604ef38bc4000b7545b241094b7f5a027c9fac4" \ No newline at end of file +gitlab_arm_source_sha256="18d385af2a59fb37c6282298ccb7bbbf091d8ff39fbcde581226e35d5f3792dc" From a4c169584a2c264c646481612eaa9db1e1116856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Mon, 24 Dec 2018 16:25:49 +0100 Subject: [PATCH 24/40] update backup and restore scripts --- scripts/backup | 60 ++++++++++++++++++++++------------- scripts/restore | 83 +++++++++++++++++++++++++++---------------------- 2 files changed, 83 insertions(+), 60 deletions(-) diff --git a/scripts/backup b/scripts/backup index af8ccd9..12f69e4 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,33 +1,49 @@ #!/bin/bash -# Exit on command errors and treat unset variables as an error -set -eu - -# See comments in install script -app=$YNH_APP_INSTANCE_NAME +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= # Source YunoHost helpers source /usr/share/yunohost/helpers -# Backup sources & data -# Note: the last argument is where to save this path, see the restore script. -ynh_backup "/var/www/${app}" "sources" +# Load common variables and helpers +source ./_common.sh -### MySQL (remove if not used) ### -# If a MySQL database is used: -# # Dump the database -# dbname=$app -# dbuser=$app -# dbpass=$(ynh_app_setting_get "$app" mysqlpwd) -# mysqldump -u "$dbuser" -p"$dbpass" --no-create-db "$dbname" > ./dump.sql -### MySQL end ### +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# LOAD SETTINGS +#================================================= # Copy NGINX configuration domain=$(ynh_app_setting_get "$app" domain) -ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# # Copy PHP-FPM pool configuration -# ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf" -### PHP end ### +#================================================= +# STANDARD BACKUP STEPS +#================================================= +# BACKUP THE NGINX CONFIGURATION +#================================================= + +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" + +#================================================= +# BACKUP THE APP MAIN DIR +#================================================= + +# Use gitlab-rake to backup +gitlab-rake gitlab:backup:create + +ynh_backup "$config_path/gitlab-secrets.json" "gitlab-secrets.json" +ynh_backup "$config_path/gitlab.rb" "gitlab.rb" \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 93169e9..336be39 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,52 +1,59 @@ #!/bin/bash -# Note: each files and directories you've saved using the ynh_backup helper -# will be located in the current directory, regarding the last argument. - -# Exit on command errors and treat unset variables as an error -set -eu - -# See comments in install script -app=$YNH_APP_INSTANCE_NAME +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= # Source YunoHost helpers source /usr/share/yunohost/helpers -# Retrieve old app settings +# Load common variables and helpers +source ./_common.sh + +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# LOAD SETTINGS +#================================================= + +# Copy NGINX configuration domain=$(ynh_app_setting_get "$app" domain) -path_url=$(ynh_app_setting_get "$app" path_url) -# Check domain/path availability -sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \ - || ynh_die "Path not available: ${domain}${path_url}" +#================================================= +# STANDARD RESTORATION STEPS +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= -# Restore sources & data -src_path="/var/www/${app}" -sudo cp -a ./sources "$src_path" +ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" -# Restore permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) -sudo chown -R root: "$src_path" +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= -### MySQL (remove if not used) ### -# If a MySQL database is used: -# # Create and restore the database -# dbname=$app -# dbuser=$app -# dbpass=$(ynh_app_setting_get "$app" mysqlpwd) -# ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" -# ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./dump.sql -### MySQL end ### +gitlab-ctl stop unicorn +gitlab-ctl stop sidekiq -# Restore NGINX configuration -sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf" +fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) +basename="/var/opt/gitlab/backups/" +last_backup="${filename%_gitlab_backup.tar}" -### PHP (remove if not used) ### -# If a dedicated php-fpm process is used: -# # Copy PHP-FPM pool configuration and reload the service -# sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" -# sudo service php5-fpm reload -### PHP end ### +# Use gitlab-rake to backup +gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup -# Restart webserver -sudo service nginx reload +ynh_backup "$config_path/gitlab-secrets.json" "gitlab-secrets.json" +ynh_backup "$config_path/gitlab.rb" "gitlab.rb" + +gitlab-ctl restart +gitlab-rake gitlab:check SANITIZE=true From 3abea81969503b58a2ac31a4eef0b16124a628ff Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 24 Dec 2018 18:16:01 +0100 Subject: [PATCH 25/40] Update backup --- scripts/backup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index 12f69e4..5fdec5a 100644 --- a/scripts/backup +++ b/scripts/backup @@ -10,7 +10,7 @@ source /usr/share/yunohost/helpers # Load common variables and helpers -source ./_common.sh +source ../settings/scripts/_common.sh #================================================= # MANAGE SCRIPT FAILURE @@ -46,4 +46,4 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" gitlab-rake gitlab:backup:create ynh_backup "$config_path/gitlab-secrets.json" "gitlab-secrets.json" -ynh_backup "$config_path/gitlab.rb" "gitlab.rb" \ No newline at end of file +ynh_backup "$config_path/gitlab.rb" "gitlab.rb" From 67d1961ce6e314ac1d6431cae987fc392f153b4f Mon Sep 17 00:00:00 2001 From: bourreP Date: Mon, 24 Dec 2018 18:16:16 +0100 Subject: [PATCH 26/40] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 336be39..277e242 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,7 +10,7 @@ source /usr/share/yunohost/helpers # Load common variables and helpers -source ./_common.sh +source ../settings/scripts/_common.sh #================================================= # MANAGE SCRIPT FAILURE From 1bc5173c78206f73f97b6a15909ad436267e87d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Mon, 24 Dec 2018 19:10:30 +0100 Subject: [PATCH 27/40] fix restore --- scripts/backup | 9 +++------ scripts/restore | 28 ++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/scripts/backup b/scripts/backup index 5fdec5a..60e2900 100644 --- a/scripts/backup +++ b/scripts/backup @@ -16,10 +16,6 @@ source ../settings/scripts/_common.sh # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -37,6 +33,7 @@ domain=$(ynh_app_setting_get "$app" domain) #================================================= ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "$final_path" #================================================= # BACKUP THE APP MAIN DIR @@ -45,5 +42,5 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" # Use gitlab-rake to backup gitlab-rake gitlab:backup:create -ynh_backup "$config_path/gitlab-secrets.json" "gitlab-secrets.json" -ynh_backup "$config_path/gitlab.rb" "gitlab.rb" +ynh_backup "$config_path/gitlab-secrets.json" +ynh_backup "$config_path/gitlab.rb" diff --git a/scripts/restore b/scripts/restore index 277e242..6e42948 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,10 +16,6 @@ source ../settings/scripts/_common.sh # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -29,6 +25,16 @@ ynh_abort_if_errors # Copy NGINX configuration domain=$(ynh_app_setting_get "$app" domain) +path_url=$(ynh_app_setting_get "$app" path_url) + +#================================================= +# CHECK IF THE APP CAN BE RESTORED +#================================================= + +ynh_webpath_available $domain $path_url \ +|| ynh_die "Path not available: ${domain}${path_url}" +test ! -d $final_path \ +|| ynh_die "There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS @@ -42,6 +48,16 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" # RESTORE THE APP MAIN DIR #================================================= +ynh_restore_file "$final_path" + +#================================================= +# SPECIFIC RESTORATION +#================================================= +# REINSTALL DEPENDENCIES +#================================================= + +ynh_install_app_dependencies openssh-server + gitlab-ctl stop unicorn gitlab-ctl stop sidekiq @@ -52,8 +68,8 @@ last_backup="${filename%_gitlab_backup.tar}" # Use gitlab-rake to backup gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup -ynh_backup "$config_path/gitlab-secrets.json" "gitlab-secrets.json" -ynh_backup "$config_path/gitlab.rb" "gitlab.rb" +ynh_restore_file "$config_path/gitlab-secrets.json" +ynh_restore_file "$config_path/gitlab.rb" gitlab-ctl restart gitlab-rake gitlab:check SANITIZE=true From b1062284fd7ab82a44bcb3c1272b6f4b0fa23c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Mon, 24 Dec 2018 19:31:51 +0100 Subject: [PATCH 28/40] fix restore --- scripts/backup | 2 +- scripts/restore | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/backup b/scripts/backup index 60e2900..917a9ef 100644 --- a/scripts/backup +++ b/scripts/backup @@ -33,7 +33,6 @@ domain=$(ynh_app_setting_get "$app" domain) #================================================= ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_backup "$final_path" #================================================= # BACKUP THE APP MAIN DIR @@ -42,5 +41,6 @@ ynh_backup "$final_path" # Use gitlab-rake to backup gitlab-rake gitlab:backup:create +ynh_backup "/var/opt/$app/backups/" ynh_backup "$config_path/gitlab-secrets.json" ynh_backup "$config_path/gitlab.rb" diff --git a/scripts/restore b/scripts/restore index 6e42948..ae77983 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,12 +44,6 @@ test ! -d $final_path \ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE APP MAIN DIR -#================================================= - -ynh_restore_file "$final_path" - #================================================= # SPECIFIC RESTORATION #================================================= @@ -58,11 +52,19 @@ ynh_restore_file "$final_path" ynh_install_app_dependencies openssh-server +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= + +setup_source $architecture + +ynh_restore_file "$/var/opt/$app/backups/" + gitlab-ctl stop unicorn gitlab-ctl stop sidekiq -fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) -basename="/var/opt/gitlab/backups/" +fullfile=$(ls /var/opt/$app/backups/*_gitlab* --file -c1 | head -1) +basename="/var/opt/$app/backups/" last_backup="${filename%_gitlab_backup.tar}" # Use gitlab-rake to backup From 2cb2f36f5db8b3a1b22edf268fbb1c85542e53df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Mon, 24 Dec 2018 19:55:59 +0100 Subject: [PATCH 29/40] fix restore --- scripts/backup | 1 + scripts/restore | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/backup b/scripts/backup index 917a9ef..a646fe1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -41,6 +41,7 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" # Use gitlab-rake to backup gitlab-rake gitlab:backup:create +ynh_backup "$final_path" ynh_backup "/var/opt/$app/backups/" ynh_backup "$config_path/gitlab-secrets.json" ynh_backup "$config_path/gitlab.rb" diff --git a/scripts/restore b/scripts/restore index ae77983..296780f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,6 +44,14 @@ test ! -d $final_path \ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= + +ynh_restore_file "$final_path" + +ynh_restore_file "/var/opt/$app/backups/" + #================================================= # SPECIFIC RESTORATION #================================================= @@ -52,19 +60,16 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_install_app_dependencies openssh-server -#================================================= -# RESTORE THE APP MAIN DIR -#================================================= - -setup_source $architecture - -ynh_restore_file "$/var/opt/$app/backups/" +ln -s /opt/gitlab/bin/gitlab-ctl /usr/bin/gitlab-ctl +ln -s /opt/gitlab/bin/gitlab-psql /usr/bin/gitlab-psql +ln -s /opt/gitlab/bin/gitlab-rails /usr/bin/gitlab-rails +ln -s /opt/gitlab/bin/gitlab-rake /usr/bin/gitlab-rake gitlab-ctl stop unicorn gitlab-ctl stop sidekiq -fullfile=$(ls /var/opt/$app/backups/*_gitlab* --file -c1 | head -1) -basename="/var/opt/$app/backups/" +fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) +basename="/var/opt/gitlab/backups/" last_backup="${filename%_gitlab_backup.tar}" # Use gitlab-rake to backup From 35bff9524ecfd8b85f7dde28de20ba3ab8047019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 19:01:57 +0100 Subject: [PATCH 30/40] fix restore --- scripts/restore | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index 296780f..288ea0c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,9 +65,6 @@ ln -s /opt/gitlab/bin/gitlab-psql /usr/bin/gitlab-psql ln -s /opt/gitlab/bin/gitlab-rails /usr/bin/gitlab-rails ln -s /opt/gitlab/bin/gitlab-rake /usr/bin/gitlab-rake -gitlab-ctl stop unicorn -gitlab-ctl stop sidekiq - fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) basename="/var/opt/gitlab/backups/" last_backup="${filename%_gitlab_backup.tar}" From 3ddbb2f48352203a47c1d272df4d5cb1d2e7dacf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 19:22:24 +0100 Subject: [PATCH 31/40] fix restore --- scripts/backup | 1 - scripts/restore | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/backup b/scripts/backup index a646fe1..917a9ef 100644 --- a/scripts/backup +++ b/scripts/backup @@ -41,7 +41,6 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" # Use gitlab-rake to backup gitlab-rake gitlab:backup:create -ynh_backup "$final_path" ynh_backup "/var/opt/$app/backups/" ynh_backup "$config_path/gitlab-secrets.json" ynh_backup "$config_path/gitlab.rb" diff --git a/scripts/restore b/scripts/restore index 288ea0c..01c8b26 100644 --- a/scripts/restore +++ b/scripts/restore @@ -11,6 +11,7 @@ source /usr/share/yunohost/helpers # Load common variables and helpers source ../settings/scripts/_common.sh +source ../settings/scripts/upgrade.d/upgrade.sh #================================================= # MANAGE SCRIPT FAILURE @@ -48,7 +49,9 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" # RESTORE THE APP MAIN DIR #================================================= -ynh_restore_file "$final_path" +ynh_install_app_dependencies openssh-server + +setup_source $architecture ynh_restore_file "/var/opt/$app/backups/" @@ -58,13 +61,6 @@ ynh_restore_file "/var/opt/$app/backups/" # REINSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies openssh-server - -ln -s /opt/gitlab/bin/gitlab-ctl /usr/bin/gitlab-ctl -ln -s /opt/gitlab/bin/gitlab-psql /usr/bin/gitlab-psql -ln -s /opt/gitlab/bin/gitlab-rails /usr/bin/gitlab-rails -ln -s /opt/gitlab/bin/gitlab-rake /usr/bin/gitlab-rake - fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) basename="/var/opt/gitlab/backups/" last_backup="${filename%_gitlab_backup.tar}" From 59c5d4a0dbd794e1cdc0ddc84ce9bd1f6cb7224e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 19:32:44 +0100 Subject: [PATCH 32/40] fix restore --- scripts/restore | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 01c8b26..d3d882c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,12 +6,19 @@ # IMPORT GENERIC HELPERS #================================================= +if [ ! -e _common.sh ]; then + # Get the _common.sh file if it's not in the current directory + cp ../settings/scripts/_common.sh ./_common.sh + mkdir ./upgrade.d + cp ../settings/upgrade.d/upgrade.sh ./upgrade.d/upgrade.sh + chmod a+rx _common.sh upgrade.d/upgrade.sh +fi + # Source YunoHost helpers source /usr/share/yunohost/helpers # Load common variables and helpers -source ../settings/scripts/_common.sh -source ../settings/scripts/upgrade.d/upgrade.sh +source _common.sh #================================================= # MANAGE SCRIPT FAILURE From 9f3db97b7891a705bee2f10e47f57fef63372bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 19:41:43 +0100 Subject: [PATCH 33/40] fix restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index d3d882c..7f9e433 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,7 +10,7 @@ if [ ! -e _common.sh ]; then # Get the _common.sh file if it's not in the current directory cp ../settings/scripts/_common.sh ./_common.sh mkdir ./upgrade.d - cp ../settings/upgrade.d/upgrade.sh ./upgrade.d/upgrade.sh + cp ../settings/scripts/upgrade.d/upgrade.sh ./upgrade.d/upgrade.sh chmod a+rx _common.sh upgrade.d/upgrade.sh fi From c85da3979508b1882f722a809cd5d30362c73591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 19:51:27 +0100 Subject: [PATCH 34/40] fix restore --- scripts/restore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/restore b/scripts/restore index 7f9e433..ca07a3b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,7 +10,9 @@ if [ ! -e _common.sh ]; then # Get the _common.sh file if it's not in the current directory cp ../settings/scripts/_common.sh ./_common.sh mkdir ./upgrade.d + mkdir ../conf cp ../settings/scripts/upgrade.d/upgrade.sh ./upgrade.d/upgrade.sh + cp ../settings/conf/*.default ../conf/ chmod a+rx _common.sh upgrade.d/upgrade.sh fi From 67616b642171ab318df04f43dddede8f200c004a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 20:08:49 +0100 Subject: [PATCH 35/40] fix restore --- scripts/restore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index ca07a3b..b5424b0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -60,6 +60,9 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_install_app_dependencies openssh-server +ynh_restore_file "$config_path/gitlab-secrets.json" +ynh_restore_file "$config_path/gitlab.rb" + setup_source $architecture ynh_restore_file "/var/opt/$app/backups/" @@ -77,8 +80,5 @@ last_backup="${filename%_gitlab_backup.tar}" # Use gitlab-rake to backup gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup -ynh_restore_file "$config_path/gitlab-secrets.json" -ynh_restore_file "$config_path/gitlab.rb" - gitlab-ctl restart gitlab-rake gitlab:check SANITIZE=true From 38d9632d8c691a4f4399ffbccb6a93ef2115520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 20:31:52 +0100 Subject: [PATCH 36/40] fix restore --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index b5424b0..daf9b31 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,6 +75,7 @@ ynh_restore_file "/var/opt/$app/backups/" fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) basename="/var/opt/gitlab/backups/" +filename=$(basename -- "$fullfile") last_backup="${filename%_gitlab_backup.tar}" # Use gitlab-rake to backup From ce8aeddb0d04fa8e28b7f9551f0393f6f8082343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 20:55:11 +0100 Subject: [PATCH 37/40] fix restore --- scripts/backup | 13 ++++++++++++- scripts/restore | 29 +++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/scripts/backup b/scripts/backup index 917a9ef..fad059a 100644 --- a/scripts/backup +++ b/scripts/backup @@ -16,6 +16,12 @@ source ../settings/scripts/_common.sh # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + + rm /var/opt/gitlab/backups/*_gitlab_backup.tar + true +} + # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -35,12 +41,17 @@ domain=$(ynh_app_setting_get "$app" domain) ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= -# BACKUP THE APP MAIN DIR +# BACKUP GITLAB DATABASE #================================================= # Use gitlab-rake to backup gitlab-rake gitlab:backup:create ynh_backup "/var/opt/$app/backups/" + +#================================================= +# BACKUP CONF FILES +#================================================= + ynh_backup "$config_path/gitlab-secrets.json" ynh_backup "$config_path/gitlab.rb" diff --git a/scripts/restore b/scripts/restore index daf9b31..1f7e6c5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,6 +26,12 @@ source _common.sh # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + + rm /var/opt/gitlab/backups/*_gitlab_backup.tar + true +} + # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -55,14 +61,22 @@ test ! -d $final_path \ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= -# RESTORE THE APP MAIN DIR +# REINSTALL DEPENDENCIES #================================================= ynh_install_app_dependencies openssh-server +#================================================= +# RESTORE CONF FILES +#================================================= + ynh_restore_file "$config_path/gitlab-secrets.json" ynh_restore_file "$config_path/gitlab.rb" +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= + setup_source $architecture ynh_restore_file "/var/opt/$app/backups/" @@ -70,7 +84,7 @@ ynh_restore_file "/var/opt/$app/backups/" #================================================= # SPECIFIC RESTORATION #================================================= -# REINSTALL DEPENDENCIES +# RESTORE GITLAB DATABASE #================================================= fullfile=$(ls /var/opt/gitlab/backups/*_gitlab* --file -c1 | head -1) @@ -78,8 +92,19 @@ basename="/var/opt/gitlab/backups/" filename=$(basename -- "$fullfile") last_backup="${filename%_gitlab_backup.tar}" +gitlab-ctl stop unicorn +gitlab-ctl stop sidekiq + # Use gitlab-rake to backup gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup gitlab-ctl restart gitlab-rake gitlab:check SANITIZE=true + +#================================================= +# GENERIC FINALIZATION +#================================================= +# RELOAD NGINX +#================================================= + +systemctl reload nginx \ No newline at end of file From 67cf132f42dd6c2c02427630dcb2e6389d2c1c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Tue, 25 Dec 2018 21:03:39 +0100 Subject: [PATCH 38/40] fix restore --- scripts/restore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 1f7e6c5..1bb89e6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,8 +9,8 @@ if [ ! -e _common.sh ]; then # Get the _common.sh file if it's not in the current directory cp ../settings/scripts/_common.sh ./_common.sh - mkdir ./upgrade.d - mkdir ../conf + mkdir ./upgrade.d + mkdir ../conf cp ../settings/scripts/upgrade.d/upgrade.sh ./upgrade.d/upgrade.sh cp ../settings/conf/*.default ../conf/ chmod a+rx _common.sh upgrade.d/upgrade.sh From 43fd717f6a3322494600d007b9e55378cc751665 Mon Sep 17 00:00:00 2001 From: bourreP Date: Thu, 3 Jan 2019 18:01:49 +0100 Subject: [PATCH 39/40] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c23ab43..bf921c8 100644 --- a/README.md +++ b/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:** 1.5.3 +**Shipped version:** 1.6.O ## Screenshots From cf1cb19dd8d7e37213d2903321c59ab14491d025 Mon Sep 17 00:00:00 2001 From: bourreP Date: Thu, 3 Jan 2019 19:44:04 +0100 Subject: [PATCH 40/40] listen on all IPv4 and IPv6 addresses --- conf/gitlab.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3322e3d..d02aac3 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -19,5 +19,6 @@ EOS nginx['listen_port'] = __PORT__ nginx['listen_https'] = false +nginx['listen_addresses'] = ["0.0.0.0", "[::]"] # listen on all IPv4 and IPv6 addresses unicorn['port'] = __PORTUNICORN__