diff --git a/README.md b/README.md index e8f8820..606dbaf 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Acropolis was forked from diaspora* in August 2021. The idea for the fork is to optimize toward community, that is making it as easy as possible to contribute. We're following a protocol that basically says if you are addressing a valid problem, your code gets merged. Everything else follows from that. -**Shipped version:** 2021.12.23~ynh1 +**Shipped version:** 2021.12.29~ynh1 diff --git a/README_fr.md b/README_fr.md index 55c8c77..ab631c6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Acropolis was forked from diaspora* in August 2021. The idea for the fork is to optimize toward community, that is making it as easy as possible to contribute. We're following a protocol that basically says if you are addressing a valid problem, your code gets merged. Everything else follows from that. -**Version incluse :** 2021.12.23~ynh1 +**Version incluse :** 2021.12.29~ynh1 diff --git a/bump-version.rb b/bump-version.rb index b2a5c65..37dd75a 100755 --- a/bump-version.rb +++ b/bump-version.rb @@ -69,4 +69,4 @@ Yunohost::AppSrcFile.new().update(url, sum) # Update manifest file Yunohost::ManifestFile.new().update_with_version(version) -puts "Done!" +puts "Done!" \ No newline at end of file diff --git a/check_process b/check_process index 38c0fba..c3d52c5 100644 --- a/check_process +++ b/check_process @@ -3,6 +3,7 @@ domain="domain.tld" path="/path" admin="john" + email="admin@domain.tld" language="fr" is_public=1 password="1Strong-Password" diff --git a/conf/app.src b/conf/app.src index e29318d..c58d12e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/magicstone-dev/acropolis/archive/a3dcee047d1687e6e4e265f50d51cf02d5125bce.tar.gz -SOURCE_SUM=6bb9c435024a7e313f93aedfeb26405271c87725e219934e3e541ffb46148f08 +SOURCE_URL=https://github.com/magicstone-dev/acropolis/archive/d427864c7a5b1bc766054322a8a080594ba004d4.tar.gz +SOURCE_SUM=3f482fb978ac2d2dfcdd747ca2b5e3761a21f6c466418337eb03a729e0e4fa07 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=a3dcee047d1687e6e4e265f50d51cf02d5125bce.tar.gz +SOURCE_FILENAME=d427864c7a5b1bc766054322a8a080594ba004d4.tar.gz SOURCE_EXTRACT=true \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4e741cc..79a0133 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Dynamic fork of diaspora*'s federated social network", "fr": "Fourche dynamique du réseau social fédéré de diaspora*" }, - "version": "2021.12.23~ynh1", + "version": "2021.12.29~ynh1", "url": "https://github.com/magicstone-dev/acropolis", "upstream": { "license": "free", @@ -30,6 +30,21 @@ "name": "domain", "type": "domain" }, + { + "name": "admin", + "type": "user" + }, + { + "name": "email", + "type": "email", + "ask": { + "en": "Enter email address for administative notifications." + } + }, + { + "name": "password", + "type": "password" + }, { "name": "is_public", "type": "boolean", diff --git a/scripts/install b/scripts/install index 8791302..92dffbd 100644 --- a/scripts/install +++ b/scripts/install @@ -28,6 +28,9 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC +admin=$YNH_APP_ARG_ADMIN +email=$YNH_APP_ARG_EMAIL +password=$YNH_APP_ARG_PASSWORD ### If it's a multi-instance app, meaning it can be installed several times independently ### The id of the app as stated in the manifest is available as $YNH_APP_ID @@ -247,13 +250,15 @@ pushd "$final_path" sudo -u $app $ynh_ruby_load_path bin/bundle install --full-index popd -ynh_script_progression --message="Preparing the database..." +ynh_script_progression --message="Preparing the database and create initial admin user..." pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" ynh_exec_warn_less $rake_exec db:migrate ynh_exec_warn_less $rake_exec assets:precompile + ynh_exec_warn_less $rake_exec "admin:create[$admin, $email, $password]" popd + #================================================= # SETUP THE CRON FILE #=================================================