diff --git a/conf/parameters.yml b/conf/parameters.yml index f231f54..05c572f 100644 --- a/conf/parameters.yml +++ b/conf/parameters.yml @@ -22,10 +22,6 @@ parameters: fos_oauth_server_refresh_token_lifetime: 1209600 from_email: no-reply@__DOMAIN__ rss_limit: 50 - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest redis_scheme: tcp redis_host: localhost redis_port: 6379 diff --git a/manifest.toml b/manifest.toml index 238ccc7..5ac8ea1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,10 +41,6 @@ ram.runtime = "50M" type = "group" default = "visitors" - - - - [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" @@ -68,12 +64,6 @@ ram.runtime = "50M" sha256 = "a6b93fb05ef6bf9ab206fd4bcffda763a2cf33ea27e7f83000c335bbdf97f310" autoupdate.strategy = "latest_github_tag" - [resources.sources.rabbitmq] - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.12.8/rabbitmq-server_3.12.8-1_all.deb" - sha256 = "bc796fed9477c6c2ea56b3ecaea529ee3abc19cf2bab74a5fb79fad856d2dfef" - rename ="rabbitmq-server.deb" - autoupdate.strategy = "latest_github_tag" - [resources.system_user] allow_email = true @@ -83,7 +73,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "erlang-base, erlang-asn1, erlang-crypto, erlang-eldap, erlang-ftp, erlang-inets, erlang-mnesia, erlang-os-mon, erlang-parsetools, erlang-public-key, erlang-runtime-tools, erlang-snmp, erlang-ssl, erlang-syntax-tools, erlang-tftp, erlang-tools, erlang-xmerl, mariadb-server, php8.2-cli, php8.2-mysql, php8.2-gd, php8.2-tidy, php8.2-curl, php8.2-gettext, php8.2-redis, php8.2-xml, php8.2-mbstring, php8.2-ldap, php8.2-intl" + packages = "mariadb-server, php8.2-cli, php8.2-mysql, php8.2-gd, php8.2-tidy, php8.2-curl, php8.2-gettext, php8.2-redis, php8.2-xml, php8.2-mbstring, php8.2-ldap, php8.2-intl" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 200bd3a..ecbb235 100644 --- a/scripts/install +++ b/scripts/install @@ -20,16 +20,6 @@ ynh_script_progression --message="Setting up source files..." --weight=6 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#================================================= -# INSTALL RABBITMQ -#================================================= -ynh_script_progression --message="Installing RabbitMQ..." - -tempdir="$(mktemp -d)" -ynh_setup_source --dest_dir=$tempdir --source_id="rabbitmq" -dpkg -i $tempdir/rabbitmq-server.deb -ynh_secure_remove --file="$tempdir" - #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/remove b/scripts/remove index 0a53c5d..e8afc43 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,8 +26,6 @@ ynh_remove_fpm_config # Remove the dedicated Fail2Ban config ynh_remove_fail2ban_config -dpkg --remove rabbitmq-server - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d7478e2..9144704 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,16 +34,6 @@ if [ -z "${name:-}" ]; then ynh_app_setting_set --app=$app --key=name --value=$name fi -#================================================= -# INSTALL RABBITMQ -#================================================= -ynh_script_progression --message="Installing RabbitMQ..." - -tempdir="$(mktemp -d)" -ynh_setup_source --dest_dir=$tempdir --source_id="rabbitmq" -dpkg -i $tempdir/rabbitmq-server.deb -ynh_secure_remove --file="$tempdir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================