Use elasticsearch8 package

This commit is contained in:
Florent 2023-02-03 12:23:07 +01:00 committed by Florent F
parent baacd49237
commit ba0f6a2720
9 changed files with 20 additions and 13 deletions

View file

@ -18,6 +18,8 @@
# upgrade=1 from_commit=e9864a6c794ba3ec5e6359b298d299f513a157e7
# 0.0.1.2021.12.28~ynh1
upgrade=1 from_commit=3409d4986706a0b89c36447a2f435f4cd8dde155
# 0.0.1.2022.06.03~ynh1
upgrade=1 from_commit=baacd49237e18002e2048516f7f25487394a9197
backup_restore=1
multi_instance=1
port_already_use=0

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://framagit.org/framasoft/peertube/search-index/-/archive/b44e850fa1604cebac19eb822e9d555f673085b0/search-index-b44e850fa1604cebac19eb822e9d555f673085b0.tar.gz
SOURCE_SUM=7a68fd70aeaac05d06fbbb3c8cf7a375e9d2e112235e4af6857630380e114b18
SOURCE_URL=https://framagit.org/framasoft/peertube/search-index/-/archive/adfe422cc1450ba1f94d0771de59e734137e88cf/search-index-adfe422cc1450ba1f94d0771de59e734137e88cf.tar.gz
SOURCE_SUM=a2434da2a28af6fb5d7e8919a2ee950ff5795bd0750a32976cc8a02daad12855
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true

View file

@ -9,7 +9,7 @@ webserver:
elastic-search:
hostname: 'localhost'
port: 9200
port: __ES_PORT__
indexes:
videos: 'peertube-index-videos'
channels: 'peertube-index-channels'

View file

@ -6,7 +6,7 @@
"en": "Search engine for PeerTube videos and channels",
"fr": "Moteur de recherche de vidéos et chaînes PeerTube"
},
"version": "0.0.1.2022.06.03~ynh1",
"version": "0.0.1.2023-01-04~ynh1",
"url": "https://search.joinpeertube.org/",
"upstream": {
"license": "AGPL-3.0-only",

View file

@ -6,6 +6,7 @@
# dependencies used by the app
pkg_dependencies="git"
app_dependencies="elasticsearch8"
extra_pkg_dependencies="elasticsearch-oss"

View file

@ -64,10 +64,9 @@ ynh_app_setting_set --app=$app --key=port --value=$port
#=================================================
ynh_script_progression --message="Installing dependencies..."
ynh_install_apps --apps="$app_dependencies"
ynh_install_app_dependencies $pkg_dependencies
ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch"
systemctl enable elasticsearch.service --quiet
systemctl start elasticsearch.service
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
@ -123,6 +122,7 @@ popd
#=================================================
ynh_script_progression --message="Adding a config file..."
es_port=$(ynh_app_setting_get --app=elasticsearch8 --key=port)
ynh_add_config --template="../conf/default.yaml" --destination="$final_path/config/production.yaml"
chmod 400 "$final_path/config/production.yaml"

View file

@ -71,7 +71,9 @@ ynh_remove_nginx_config
ynh_script_progression --message="Removing dependencies..."
# Remove metapackage and its dependencies
ynh_remove_nodejs
ynh_remove_app_dependencies
ynh_remove_apps
#=================================================
# GENERIC FINALIZATION

View file

@ -75,10 +75,8 @@ chown -R $app:$app "$final_path"
ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies
ynh_install_apps --apps="$app_dependencies"
ynh_install_app_dependencies $pkg_dependencies
ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch"
systemctl enable elasticsearch.service --quiet
systemctl start elasticsearch.service
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"

View file

@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
port=$(ynh_app_setting_get --app=$app --key=port)
es_port=$(ynh_app_setting_get --app=elasticsearch8 --key=port)
#=================================================
# CHECK VERSION
@ -104,10 +105,13 @@ ynh_add_nginx_config
#=================================================
ynh_script_progression --message="Upgrading dependencies..."
if ynh_compare_current_package_version --comparison lt --version 0.0.1.2023-01-04~ynh1; then
# Remove elasticsearch from repositories
ynh_remove_app_dependencies
fi
ynh_install_apps --apps="$app_dependencies"
ynh_install_app_dependencies $pkg_dependencies
ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch"
systemctl enable elasticsearch.service --quiet
systemctl start elasticsearch.service
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"