diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 6e1050a..64df660 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -27,6 +27,11 @@ jobs: with: python-version: '${{ matrix.python-version }}' + - uses: actions/cache@v2 + with: + path: ~/.cache/ + key: dot-cache-files + - name: 'Install package' run: | pip3 install poetry diff --git a/config_panel.toml b/config_panel.toml index 0061ee3..921a8cb 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -9,13 +9,13 @@ services = ["__APP__"] [main.config.default_from_email] ask = "from email" - type = "string" + type = "email" help = "Default email address to use for various automated emails." bind = "default_from_email:__FINALPATH__/settings.py" [main.config.admin_email] ask = "ADMIN email" - type = "string" + type = "email" help = "EMail address for error emails." bind = "admin_email:__FINALPATH__/settings.py" diff --git a/scripts/_common.sh b/scripts/_common.sh index eb4830b..24083aa 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,7 +34,7 @@ default_from_email="${app}@${domain}" public_path=/var/www/$app final_path=/opt/yunohost/$app log_path=/var/log/$app -log_file="${log_path}/django_example_ynh.log" +log_file="${log_path}/${app}.log" #================================================= # COMMON VARIABLES @@ -85,17 +85,3 @@ ynh_redis_remove_db() { redis-cli -n "$db" flushall } -#================================================= - -# Execute a command as another user -# usage: ynh_exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} diff --git a/scripts/change_url b/scripts/change_url index 326e707..5bb62fb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -30,7 +30,11 @@ final_path=$(ynh_app_setting_get --app="$app" --key=final_path) log_path=$(ynh_app_setting_get --app="$app" --key=log_path) port=$(ynh_app_setting_get --app="$app" --key=port) + db_pwd=$(ynh_app_setting_get --app="$app" --key=psqlpwd) +db_name=$(ynh_sanitize_dbid --db_name="$app") +db_user=$db_name + redis_db=$(ynh_app_setting_get --app="$app" --key=redis_db) #------------------------------------------------- diff --git a/scripts/install b/scripts/install index 85b33ea..751ca6f 100755 --- a/scripts/install +++ b/scripts/install @@ -228,9 +228,9 @@ then fi #================================================= -# Start django_example_ynh via systemd +# Start the app server via systemd #================================================= -ynh_script_progression --message="Starting django_example_ynh's services..." --weight=5 +ynh_script_progression --message="Starting the application..." --weight=5 ynh_systemd_action --service_name="$app" --action="start" diff --git a/scripts/upgrade b/scripts/upgrade index dd78304..08bb3a3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -207,9 +207,9 @@ chmod o-rwx "$public_path" chmod o-rwx "$final_path" #================================================= -# Start django_example_ynh via systemd +# Start the app server via systemd #================================================= -ynh_script_progression --message="Starting django_example_ynh's services..." --weight=5 +ynh_script_progression --message="Starting the application..." --weight=5 ynh_systemd_action --service_name="$app" --action="start"