diff --git a/README.md b/README.md index fc45948..e342eef 100644 --- a/README.md +++ b/README.md @@ -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.19.3-0~ynh5 +**Shipped version:** 1.20.2-0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e3788f5..f148731 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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. -**Version incluse :** 1.19.3-0~ynh5 +**Version incluse :** 1.20.2-0~ynh1 ## Captures d’écran diff --git a/conf/app.ini b/conf/app.ini index 78e3000..cda177d 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -2,6 +2,7 @@ APP_NAME = Forgejo RUN_USER = __APP__ RUN_MODE = prod +WORK_PATH = __INSTALL_DIR__ [database] DB_TYPE = postgres @@ -31,10 +32,11 @@ LFS_JWT_SECRET = __LFS_JWT_SECRET__ LOCAL_ROOT_URL = http://127.0.0.1:__PORT__/ [mailer] -ENABLED = true -HOST = 127.0.0.1:25 -FROM = "Forgejo" -SKIP_VERIFY = true +ENABLED = true +SMTP_ADDR = localhost +SMTP_PORT = 25 +FROM = "Forgejo" +FORCE_TRUST_SERVER_CERT = true [service] REGISTER_EMAIL_CONFIRM = false @@ -57,21 +59,25 @@ PATH = __DATA_DIR__/attachments PROVIDER = memory [log] -MODE = file -LEVEL = Info -ROOT_PATH = /var/log/__APP__ -REDIRECT_MACARON_LOG = true -MACARON = file -ROUTER_LOG_LEVEL = Warn -ROUTER = file -ENABLE_ACCESS_LOG = Warn -ACCESS = file -ENABLE_XORM_LOG = Warn -XORM = file +MODE = file +LEVEL = Info +ROOT_PATH = /var/log/__APP__ -[log.file.default] +logger.access.MODE = +logger.router.MODE = router +logger.xorm.MODE = xorm + +[log.file] FILE_NAME = forgejo.log +[log.router] +FILE_NAME = router.log +LEVEL = Warn + +[log.xorm] +FILE_NAME = xorm.log +LEVEL = Warn + [security] INSTALL_LOCK = true SECRET_KEY = __SECRET_KEY__ diff --git a/manifest.toml b/manifest.toml index 0bd8c46..e2e220d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Forgejo" description.en = "Lightweight software forge" description.fr = "Forge logiciel légère" -version = "1.19.3-0~ynh5" +version = "1.20.2-0~ynh1" maintainers = ["Emmanuel Averty"] @@ -48,12 +48,12 @@ ram.runtime = "2G" [resources] [resources.sources.main] - amd64.url = "https://codeberg.org/attachments/8dc303a9-8a4e-416c-8d6c-62e0d3e289e8" - amd64.sha256 = "84ad6db129c491c9e4b935cdb6ad7003a804d27fb70e9bc3c653d931cf62d92d" - arm64.url = "https://codeberg.org/attachments/dc0a8d51-e2f9-4395-a286-e5f6cbbc20bc" - arm64.sha256 = "e1514b0075223aef8d7992cef0b30cb9869171d4fbec4651693305ad724a530d" - armhf.url = "https://codeberg.org/attachments/b1643658-7394-45c8-9fad-9d286ec29c7d" - armhf.sha256 = "b8265436d3af7a46ffbf306917aacbe5ee00fd74dc1eee79f1d4b4cba97ec395" + amd64.url = "https://codeberg.org/attachments/483cbc17-b31a-4401-b4a0-773a8b975e2f" + amd64.sha256 = "ef7849e02e4ad56512eabe280e956913483d87228de21f3dd37ec77e40fe1f0e" + arm64.url = "https://codeberg.org/attachments/345cc669-751d-48fb-afac-e7cdbf5a827a" + arm64.sha256 = "0cf891efb6101329e5154209e5d250e6d74492a8b637efc4cbd77af587c189b0" + armhf.url = "https://codeberg.org/attachments/ceec6963-e20c-49e0-87a4-0fd531bd9ef8" + armhf.sha256 = "8c7e7d3e62021d3cdb0837e42c55bb5ff088c8765cb01faa54309ec52e40d045" format = "xz" extract = false # will be extracted during install script rename = "forgejo.xz" diff --git a/scripts/restore b/scripts/restore index 7b33d1f..a79ec3b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,11 +32,16 @@ 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" +#================================================= +# RESTORE THE LOG DIRECTORY +#================================================= +ynh_restore_file --origin_path="/var/log/$app" +chown -R $app:$app "/var/log/$app" +chmod u=rwX,g=rX,o= "/var/log/$app" + #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= @@ -68,10 +73,6 @@ ynh_script_progression --message="Restoring the logrotate configuration..." --we ynh_restore_file --origin_path="/etc/logrotate.d/$app" -ynh_restore_file --origin_path="/var/log/$app" -chown -R $app:$app "/var/log/$app" -chmod u=rwX,g=rX,o= "/var/log/$app" - #================================================= # INTEGRATE SERVICE IN YUNOHOST #=================================================