diff --git a/conf/config.toml b/conf/config.toml index 566e417..5ca5112 100644 --- a/conf/config.toml +++ b/conf/config.toml @@ -9,8 +9,8 @@ address = "127.0.0.1:__PORT__" # be replaced with a better multi-user, role-based authentication system. # IMPORTANT: Leave both values empty to disable authentication on admin # only where an external authentication is already setup. -admin_username = "__ADMIN__" -admin_password = "__PASSWORD__" +admin_username = "" +admin_password = "" # Database. [db] diff --git a/manifest.toml b/manifest.toml index f8b0abd..5ffe108 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://listmonk.app/docs/" code = "https://github.com/knadh/listmonk" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.18" architectures = ["amd64", "armhf", "arm64"] multi_instance = true ldap = false @@ -38,9 +38,6 @@ ram.runtime = "50M" [install.admin] type = "user" - [install.password] - type = "password" - [resources] [resources.sources] diff --git a/scripts/install b/scripts/install index 7b8c74b..8194146 100755 --- a/scripts/install +++ b/scripts/install @@ -10,18 +10,6 @@ source _common.sh source ynh_install_go source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -password=$YNH_APP_ARG_PASSWORD - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set --app=$app --key=password --value="$password" - #================================================= # INSTALL DEPENDENCIES #================================================= @@ -46,13 +34,15 @@ if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "arm64" ] then ynh_setup_source --dest_dir="$install_dir/build" pushd "$install_dir/build" + # Change to sources directory + cd listmonk-* # Build the sources ynh_use_go export GOPATH="$install_dir/build/go" export GOCACHE="$install_dir/build/.cache" ynh_use_nodejs make dist - mv listmonk .. + mv listmonk ../../ popd ynh_remove_go ynh_remove_nodejs diff --git a/scripts/upgrade b/scripts/upgrade index a1b1dcb..090b329 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,13 +42,14 @@ then # Install Go ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$install_dir/build" + cd listmonk-* # Build the sources ynh_use_go export GOPATH="$install_dir/build/go" export GOCACHE="$install_dir/build/.cache" ynh_use_nodejs make dist - mv listmonk .. + mv listmonk ../../ popd ynh_remove_go ynh_remove_nodejs