Merge pull request #98 from YunoHost-Apps/testing
This commit is contained in:
OniriCorpe
GitHub
commit
6348e0bfa4
13 changed files with 79 additions and 77 deletions
|
|
@ -34,7 +34,7 @@ Brought to you by an inclusive community under the umbrella of Codeberg e.V., a
|
|||
- Customize HTML templates, static files and many others.
|
||||
|
||||
|
||||
**Shipped version:** 1.21.11-1~ynh1
|
||||
**Shipped version:** 7.0.2~ynh1
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Brought to you by an inclusive community under the umbrella of Codeberg e.V., a
|
|||
- Customize HTML templates, static files and many others.
|
||||
|
||||
|
||||
**Paketatutako bertsioa:** 1.21.11-1~ynh1
|
||||
**Paketatutako bertsioa:** 7.0.2~ynh1
|
||||
|
||||
## Pantaila-argazkiak
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Présenté par une communauté inclusive sous l'égide de Codeberg e.V., une org
|
|||
- Modèle personnalisé HTML, de fichiers statiques et de nombreux autres.
|
||||
|
||||
|
||||
**Version incluse :** 1.21.11-1~ynh1
|
||||
**Version incluse :** 7.0.2~ynh1
|
||||
|
||||
## Captures d’écran
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Brought to you by an inclusive community under the umbrella of Codeberg e.V., a
|
|||
- Customize HTML templates, static files and many others.
|
||||
|
||||
|
||||
**Versión proporcionada:** 1.21.11-1~ynh1
|
||||
**Versión proporcionada:** 7.0.2~ynh1
|
||||
|
||||
## Capturas de pantalla
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Brought to you by an inclusive community under the umbrella of Codeberg e.V., a
|
|||
- Customize HTML templates, static files and many others.
|
||||
|
||||
|
||||
**分发版本：** 1.21.11-1~ynh1
|
||||
**分发版本：** 7.0.2~ynh1
|
||||
|
||||
## 截图
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ name = "Forgejo"
|
|||
description.en = "Lightweight software forge"
|
||||
description.fr = "Forge logiciel légère"
|
||||
|
||||
version = "1.21.11-1~ynh1"
|
||||
version = "7.0.2~ynh1"
|
||||
|
||||
maintainers = [ "Emmanuel Averty" ]
|
||||
|
||||
|
|
@ -48,14 +48,14 @@ ram.runtime = "2G"
|
|||
|
||||
[resources]
|
||||
[resources.sources.main]
|
||||
amd64.url = "https://codeberg.org/forgejo/forgejo/releases/download/v1.21.11-1/forgejo-1.21.11-1-linux-amd64.xz"
|
||||
amd64.sha256 = "5c22ea2249292c315712266d7785af0e18a8a5d36cce5f8924c18ab7ea97b7bd"
|
||||
arm64.url = "https://codeberg.org/forgejo/forgejo/releases/download/v1.21.11-1/forgejo-1.21.11-1-linux-arm64.xz"
|
||||
arm64.sha256 = "0b9975c14b20b49572dd6c8f9458baf0702c237724d532a4d06e434a2feb1eb6"
|
||||
armhf.url = "https://codeberg.org/forgejo/forgejo/releases/download/v1.21.11-1/forgejo-1.21.11-1-linux-arm-6.xz"
|
||||
armhf.sha256 = "0958784dba5fcb00069e46001d5d830ccaac350541d41bff3a7e0ed414cd5026"
|
||||
amd64.url = "https://codeberg.org/forgejo/forgejo/releases/download/v7.0.2/forgejo-7.0.2-linux-amd64.xz"
|
||||
amd64.sha256 = "f0424f424e670769ac5bf1fad57576585eb7630f44b9cfe620697a2b17fb159e"
|
||||
arm64.url = "https://codeberg.org/forgejo/forgejo/releases/download/v7.0.2/forgejo-7.0.2-linux-arm64.xz"
|
||||
arm64.sha256 = "0db0be5827bac884e4a045a30a896d53d713e71ca49afdde214a4a7a8226d797"
|
||||
armhf.url = "https://codeberg.org/forgejo/forgejo/releases/download/v7.0.2/forgejo-7.0.2-linux-arm-6.xz"
|
||||
armhf.sha256 = "73043f7d19b00d4759a07f866b555c61350c8edb3084f68cd1b4e41038b74c93"
|
||||
format = "whatever"
|
||||
extract = false # will be extracted during install script
|
||||
extract = false
|
||||
rename = "forgejo.xz"
|
||||
|
||||
autoupdate.asset.amd64 = "^forgejo-.*-linux-amd64.xz$"
|
||||
|
|
|
|||
|
|
@ -7,26 +7,26 @@
|
|||
function set_forgejo_login_source() {
|
||||
ynh_print_info --message="Creating forgejo login source"
|
||||
pushd "$install_dir"
|
||||
ynh_exec_as $app ./forgejo admin auth add-ldap-simple --security-protocol "Unencrypted" --name "YunoHost LDAP" --host "localhost" --port "389" --skip-tls-verify --user-search-base "ou=users,dc=yunohost,dc=org" --user-dn "uid=%s,ou=Users,dc=yunohost,dc=org" --user-filter "(&(objectclass=posixAccount)(uid=%s)(permission=cn=$app.main,ou=permission,dc=yunohost,dc=org))" --admin-filter "(permission=cn=forgejo.admin,ou=permission,dc=yunohost,dc=org)" --username-attribute "uid" --firstname-attribute "givenName" --surname-attribute "sn" --email-attribute "mail"
|
||||
ynh_exec_as "$app" ./forgejo admin auth add-ldap-simple --security-protocol "Unencrypted" --name "YunoHost LDAP" --host "localhost" --port "389" --skip-tls-verify --user-search-base "ou=users,dc=yunohost,dc=org" --user-dn "uid=%s,ou=Users,dc=yunohost,dc=org" --user-filter "(&(objectclass=posixAccount)(uid=%s)(permission=cn=$app.main,ou=permission,dc=yunohost,dc=org))" --admin-filter "(permission=cn=forgejo.admin,ou=permission,dc=yunohost,dc=org)" --username-attribute "uid" --firstname-attribute "givenName" --surname-attribute "sn" --email-attribute "mail"
|
||||
popd
|
||||
}
|
||||
|
||||
function enable_login_source_sync() {
|
||||
ynh_print_info --message="Set forgejo login source as synchronizable"
|
||||
# Enable login source synchronisation manualy because forgejo command does not allow it (https://codeberg.org/forgejo/forgejo/issues/952)
|
||||
ynh_psql_execute_as_root --database $db_name --sql "update login_source set is_sync_enabled = true where type = 5 and name = 'YunoHost LDAP'"
|
||||
ynh_psql_execute_as_root --database "$db_name" --sql "update login_source set is_sync_enabled = true where type = 5 and name = 'YunoHost LDAP'"
|
||||
}
|
||||
|
||||
function create_forgejo_api_user() {
|
||||
ynh_print_info --message="Creating forgejo api user"
|
||||
forgejo_api_user=yunohost_api
|
||||
forgejo_api_pwd=$(ynh_string_random --length=24)
|
||||
ynh_app_setting_set --app=$app --key=forgejo_api_user --value=$forgejo_api_user
|
||||
ynh_app_setting_set --app=$app --key=forgejo_api_pwd --value=$forgejo_api_pwd
|
||||
ynh_app_setting_set --app="$app" --key=forgejo_api_user --value="$forgejo_api_user"
|
||||
ynh_app_setting_set --app="$app" --key=forgejo_api_pwd --value="$forgejo_api_pwd"
|
||||
pushd "$install_dir"
|
||||
ynh_exec_as $app ./forgejo admin user create --username $forgejo_api_user --password $forgejo_api_pwd --email admin@${domain} --admin --must-change-password=false
|
||||
forgejo_api_token=$(ynh_exec_as $app ./forgejo admin user generate-access-token --username $forgejo_api_user --token-name "admin" --scopes "write:admin" --raw | tail -1)
|
||||
ynh_app_setting_set --app=$app --key=forgejo_api_token --value=$forgejo_api_token
|
||||
ynh_exec_as "$app" ./forgejo admin user create --username "$forgejo_api_user" --password "$forgejo_api_pwd" --email "admin@${domain}" --admin --must-change-password=false
|
||||
forgejo_api_token=$(ynh_exec_as "$app" ./forgejo admin user generate-access-token --username "$forgejo_api_user" --token-name "admin" --scopes "write:admin" --raw | tail -1)
|
||||
ynh_app_setting_set --app="$app" --key=forgejo_api_token --value="$forgejo_api_token"
|
||||
popd
|
||||
}
|
||||
|
||||
|
|
@ -35,18 +35,18 @@ function set_users_login_source() {
|
|||
for username in $(ynh_user_list); do
|
||||
ynh_print_info --message="Updating forgejo user login type for ${username}"
|
||||
|
||||
ynh_psql_execute_as_root --database $db_name --sql "update public.user set login_source = (select id from login_source where name = 'YunoHost LDAP' and type = 5), login_name = name, login_type = 5 where name = '${username}'"
|
||||
ynh_psql_execute_as_root --database "$db_name" --sql "update public.user set login_source = (select id from login_source where name = 'YunoHost LDAP' and type = 5), login_name = name, login_type = 5 where name = '${username}'"
|
||||
done
|
||||
}
|
||||
|
||||
function synchronize_users() {
|
||||
ynh_print_info --message="Synchronizing forgejo users"
|
||||
# Fetch the token independently such that it's redacted by Yunohost logging mechanism
|
||||
forgejo_api_token=$(ynh_app_setting_get --app=$app --key=forgejo_api_token)
|
||||
forgejo_api_token=$(ynh_app_setting_get --app="$app" --key=forgejo_api_token)
|
||||
|
||||
# Remove trailing slash from path
|
||||
local no_trailing_slash_path=${path%/}
|
||||
|
||||
# User synchronization must be launched using API : no cli exists for this purpose (https://codeberg.org/forgejo/forgejo/issues/953)
|
||||
curl --url https://${domain}${no_trailing_slash_path}/api/v1/admin/cron/sync_external_users -X POST -H "Authorization: token $forgejo_api_token" -kfsS
|
||||
curl --url "https://${domain}${no_trailing_slash_path}/api/v1/admin/cron/sync_external_users" -X POST -H "Authorization: token $forgejo_api_token" -kfsS
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
|
|||
#=================================================
|
||||
ynh_script_progression --message="Stopping a systemd service..." --weight=2
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/forgejo.log"
|
||||
ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/forgejo.log"
|
||||
|
||||
#=================================================
|
||||
# MODIFY URL IN NGINX CONF
|
||||
|
|
@ -34,7 +34,7 @@ ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
|||
ynh_exec_warn_less ynh_add_config --template="../conf/app.ini" --destination="$install_dir/custom/conf/app.ini"
|
||||
|
||||
chmod 640 "$install_dir/custom/conf/app.ini"
|
||||
chown $app:$app "$install_dir/custom/conf/app.ini"
|
||||
chown "$app:$app" "$install_dir/custom/conf/app.ini"
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALISATION
|
||||
|
|
@ -43,7 +43,7 @@ chown $app:$app "$install_dir/custom/conf/app.ini"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Starting a systemd service..." --weight=2
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
|
|
|
|||
|
|
@ -20,20 +20,20 @@ chmod +x "$install_dir/forgejo"
|
|||
mkdir -p "$install_dir/custom/conf"
|
||||
|
||||
chmod -R o-rwx "$install_dir/custom"
|
||||
chown -R $app:$app "$install_dir/custom"
|
||||
chown -R "$app:$app" "$install_dir/custom"
|
||||
|
||||
#=================================================
|
||||
# KEYS GENERATION
|
||||
#=================================================
|
||||
|
||||
secret_key=$($install_dir/forgejo generate secret SECRET_KEY)
|
||||
lfs_jwt_secret=$($install_dir/forgejo generate secret JWT_SECRET)
|
||||
internal_token=$($install_dir/forgejo generate secret INTERNAL_TOKEN)
|
||||
oauth2_jwt_secret=$($install_dir/forgejo generate secret JWT_SECRET)
|
||||
ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
|
||||
ynh_app_setting_set --app=$app --key=lfs_jwt_secret --value=$lfs_jwt_secret
|
||||
ynh_app_setting_set --app=$app --key=internal_token --value=$internal_token
|
||||
ynh_app_setting_set --app=$app --key=oauth2_jwt_secret --value=$oauth2_jwt_secret
|
||||
secret_key=$("$install_dir/forgejo" generate secret SECRET_KEY)
|
||||
lfs_jwt_secret=$("$install_dir/forgejo" generate secret JWT_SECRET)
|
||||
internal_token=$("$install_dir/forgejo" generate secret INTERNAL_TOKEN)
|
||||
oauth2_jwt_secret=$("$install_dir/forgejo" generate secret JWT_SECRET)
|
||||
ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
|
||||
ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
|
||||
ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
|
||||
ynh_app_setting_set --app="$app" --key=oauth2_jwt_secret --value="$oauth2_jwt_secret"
|
||||
|
||||
#=================================================
|
||||
# ADD A CONFIGURATION
|
||||
|
|
@ -44,7 +44,7 @@ ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
|||
ynh_add_config --template="app.ini" --destination="$install_dir/custom/conf/app.ini"
|
||||
|
||||
chmod 640 "$install_dir/custom/conf/app.ini"
|
||||
chown $app:$app "$install_dir/custom/conf/app.ini"
|
||||
chown "$app:$app" "$install_dir/custom/conf/app.ini"
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
|
|
@ -70,7 +70,7 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1
|
|||
# Use logrotate to manage application logfile(s)
|
||||
ynh_use_logrotate --logfile "/var/log/$app" --nonappend
|
||||
|
||||
chown -R $app:$app "/var/log/$app"
|
||||
chown -R "$app:$app" "/var/log/$app"
|
||||
chmod u=rwX,g=rX,o= "/var/log/$app"
|
||||
|
||||
#=================================================
|
||||
|
|
@ -78,7 +78,7 @@ chmod u=rwX,g=rX,o= "/var/log/$app"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
|
||||
|
||||
yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.log"
|
||||
yunohost service add "$app" --description="Forgejo" --log="/var/log/$app/forgejo.log"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
|
|
@ -86,7 +86,7 @@ yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.l
|
|||
ynh_script_progression --message="Starting a systemd service..." --weight=3
|
||||
|
||||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
|
||||
#=================================================
|
||||
# SETUP FAIL2BAN
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ source /usr/share/yunohost/helpers
|
|||
#=================================================
|
||||
|
||||
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
|
||||
if ynh_exec_warn_less yunohost service status $app >/dev/null
|
||||
if ynh_exec_warn_less yunohost service status "$app" >/dev/null
|
||||
then
|
||||
ynh_script_progression --message="Removing $app service integration..." --weight=1
|
||||
yunohost service remove $app
|
||||
yunohost service remove "$app"
|
||||
fi
|
||||
|
||||
# Remove the dedicated systemd config
|
||||
|
|
|
|||
|
|
@ -26,20 +26,20 @@ ynh_script_progression --message="Restoring $app main directory..." --weight=10
|
|||
ynh_restore_file --origin_path="$install_dir"
|
||||
|
||||
chmod -R o-rwx "$install_dir"
|
||||
chown -R $app:$app "$install_dir"
|
||||
chown -R "$app:$app" "$install_dir"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE DATA DIRECTORY
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the data directory..." --weight=1
|
||||
ynh_restore_file --origin_path="$data_dir" --not_mandatory
|
||||
chown -R $app:$app "$data_dir"
|
||||
chown -R "$app:$app" "$data_dir"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE LOG DIRECTORY
|
||||
#=================================================
|
||||
ynh_restore_file --origin_path="/var/log/$app"
|
||||
chown -R $app:$app "/var/log/$app"
|
||||
chown -R "$app:$app" "/var/log/$app"
|
||||
chmod u=rwX,g=rX,o= "/var/log/$app"
|
||||
|
||||
#=================================================
|
||||
|
|
@ -56,7 +56,7 @@ ynh_systemd_action --action=restart --service_name=fail2ban
|
|||
#=================================================
|
||||
ynh_script_progression --message="Restoring the database..." --weight=6
|
||||
|
||||
ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
|
||||
ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
|
||||
|
||||
#=================================================
|
||||
# RESTORE SYSTEMD
|
||||
|
|
@ -64,7 +64,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
|
|||
ynh_script_progression --message="Restoring the systemd configuration..." --weight=5
|
||||
|
||||
ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
|
||||
systemctl enable $app.service --quiet
|
||||
systemctl enable "$app.service" --quiet
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE LOGROTATE CONFIGURATION
|
||||
|
|
@ -78,14 +78,14 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
|
||||
|
||||
yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.log"
|
||||
yunohost service add "$app" --description="Forgejo" --log="/var/log/$app/forgejo.log"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Starting a systemd service..." --weight=3
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ upgrade_type=$(ynh_check_app_version_changed)
|
|||
# STOP SYSTEMD SERVICE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Stopping a systemd service..." --weight=2
|
||||
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
|
||||
ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
|
|
@ -30,18 +30,18 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
|||
|
||||
# Update forgejo login source (1.19.3-0~ynh2)
|
||||
pushd "$install_dir"
|
||||
old_login_source_id=$(ynh_exec_as $app ./forgejo admin auth list | grep "YunoHost LDAP" | grep "via BindDN" | cut -f 1)
|
||||
if [ ! -z $old_login_source_id ]; then
|
||||
old_login_source_id=$(ynh_exec_as "$app" ./forgejo admin auth list | grep "YunoHost LDAP" | grep "via BindDN" | cut -f 1)
|
||||
if [ -n "$old_login_source_id" ]; then
|
||||
ynh_print_info --message="Delete obsolete forgejo login source (LDAP via BindDN)"
|
||||
|
||||
# Ensure no user have this obsolete login source
|
||||
ynh_psql_execute_as_root --database $db_name --sql "update public.user set login_source = 0, login_type = 0 where login_source = ${old_login_source_id}"
|
||||
ynh_psql_execute_as_root --database "$db_name" --sql "update public.user set login_source = 0, login_type = 0 where login_source = ${old_login_source_id}"
|
||||
|
||||
# Delete old login source
|
||||
ynh_exec_as $app ./forgejo admin auth delete --id $old_login_source_id
|
||||
ynh_exec_as "$app" ./forgejo admin auth delete --id "$old_login_source_id"
|
||||
fi
|
||||
|
||||
ynh_exec_as $app ./forgejo admin auth list | grep "YunoHost LDAP" | grep -q "LDAP (simple auth)" ||
|
||||
ynh_exec_as "$app" ./forgejo admin auth list | grep "YunoHost LDAP" | grep -q "LDAP (simple auth)" ||
|
||||
# create new login source if not existing
|
||||
set_forgejo_login_source
|
||||
popd
|
||||
|
|
@ -53,31 +53,31 @@ enable_login_source_sync
|
|||
# .ssh directory should move from old home dir (data_dir) to new one
|
||||
# (/var/www/$app is the default value for home in resources.system_user)
|
||||
if [ -d "$data_dir/.ssh" ]; then
|
||||
mv "$data_dir/.ssh" /var/www/$app
|
||||
mv "$data_dir/.ssh" "/var/www/$app"
|
||||
fi
|
||||
|
||||
# If secret_key doesn't exist, create it
|
||||
if [ -z ${secret_key:-} ]; then
|
||||
secret_key=$($install_dir/forgejo generate secret SECRET_KEY)
|
||||
ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
|
||||
if [ -z "${secret_key:-}" ]; then
|
||||
secret_key=$("$install_dir/forgejo" generate secret SECRET_KEY)
|
||||
ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
|
||||
fi
|
||||
|
||||
# If lfs_jwt_secret doesn't exist, create it
|
||||
if [ -z ${lfs_jwt_secret:-} ]; then
|
||||
lfs_jwt_secret=$($install_dir/forgejo generate secret JWT_SECRET)
|
||||
ynh_app_setting_set --app=$app --key=lfs_jwt_secret --value=$lfs_jwt_secret
|
||||
if [ -z "${lfs_jwt_secret:-}" ]; then
|
||||
lfs_jwt_secret=$("$install_dir/forgejo" generate secret JWT_SECRET)
|
||||
ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
|
||||
fi
|
||||
|
||||
# If internal_token doesn't exist, create it
|
||||
if [ -z ${internal_token:-} ]; then
|
||||
internal_token=$($install_dir/forgejo generate secret INTERNAL_TOKEN)
|
||||
ynh_app_setting_set --app=$app --key=internal_token --value=$internal_token
|
||||
if [ -z "${internal_token:-}" ]; then
|
||||
internal_token=$("$install_dir/forgejo" generate secret INTERNAL_TOKEN)
|
||||
ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
|
||||
fi
|
||||
|
||||
# If oauth2_jwt_secret doesn't exist, create it
|
||||
if [ -z ${oauth2_jwt_secret:-} ]; then
|
||||
oauth2_jwt_secret=$($install_dir/forgejo generate secret JWT_SECRET)
|
||||
ynh_app_setting_set --app=$app --key=oauth2_jwt_secret --value=$oauth2_jwt_secret
|
||||
if [ -z "${oauth2_jwt_secret:-}" ]; then
|
||||
oauth2_jwt_secret=$("$install_dir/forgejo" generate secret JWT_SECRET)
|
||||
ynh_app_setting_set --app="$app" --key=oauth2_jwt_secret --value="$oauth2_jwt_secret"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
@ -85,11 +85,11 @@ fi
|
|||
#=================================================
|
||||
ynh_script_progression --message="Setting up source files..." --weight=3
|
||||
|
||||
ynh_setup_source --dest_dir=$install_dir --full_replace=1 --keep="custom .ssh"
|
||||
ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="custom .ssh"
|
||||
xz -f -d "$install_dir/forgejo.xz"
|
||||
|
||||
chmod -R o-rwx "$install_dir"
|
||||
chown -R $app:$app "$install_dir"
|
||||
chown -R "$app:$app" "$install_dir"
|
||||
chmod +x "$install_dir/forgejo"
|
||||
|
||||
#=================================================
|
||||
|
|
@ -101,7 +101,7 @@ ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
|
|||
ynh_add_config --template="app.ini" --destination="$install_dir/custom/conf/app.ini"
|
||||
|
||||
chmod 640 "$install_dir/custom/conf/app.ini"
|
||||
chown $app:$app "$install_dir/custom/conf/app.ini"
|
||||
chown "$app:$app" "$install_dir/custom/conf/app.ini"
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
|
|
@ -127,7 +127,7 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1
|
|||
# Use logrotate to manage application logfile(s)
|
||||
ynh_use_logrotate --logfile "/var/log/$app" --nonappend
|
||||
|
||||
chown -R $app:$app "/var/log/$app"
|
||||
chown -R "$app:$app" "/var/log/$app"
|
||||
chmod u=rwX,g=rX,o= "/var/log/$app"
|
||||
|
||||
#=================================================
|
||||
|
|
@ -135,7 +135,7 @@ chmod u=rwX,g=rX,o= "/var/log/$app"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
|
||||
|
||||
yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.log"
|
||||
yunohost service add "$app" --description="Forgejo" --log="/var/log/$app/forgejo.log"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
|
|
@ -143,13 +143,13 @@ yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.l
|
|||
ynh_script_progression --message="Starting a systemd service..." --weight=3
|
||||
|
||||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
|
||||
|
||||
|
||||
#=================================================
|
||||
# Synchronize users (backward compatibility 1.19.3-0~ynh3)
|
||||
#=================================================
|
||||
if [ -z ${forgejo_api_user:-} ]; then
|
||||
if [ -z "${forgejo_api_user:-}" ]; then
|
||||
create_forgejo_api_user
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ test_format = 1.0
|
|||
|
||||
[default]
|
||||
|
||||
# ------------
|
||||
# Tests to run
|
||||
# ------------
|
||||
# -------------------------------
|
||||
# Commits to test upgrade from
|
||||
# -------------------------------
|
||||
|
||||
test_upgrade_from.eebeab47.name = "Upgrade from 1.21.11-1~ynh1"
|
||||
Loading…
Reference in a new issue