From 2b01f7717ff17eb2dd84e5737e304d909a26422f Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Mon, 27 Dec 2021 13:32:57 +0530 Subject: [PATCH 01/19] changes --- scripts/install | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index 8791302..aa67482 100644 --- a/scripts/install +++ b/scripts/install @@ -254,6 +254,14 @@ pushd "$final_path" ynh_exec_warn_less $rake_exec db:migrate ynh_exec_warn_less $rake_exec assets:precompile popd + +ynh_script_progression --message="Create admin initial user..." + +pushd "$final_path" + rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" + ynh_exec_warn_less $rake_exec admin:create +popd + #================================================= # SETUP THE CRON FILE #================================================= From 158dd06c8d5a0218efa051f7a36174dd5ea2e929 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Mon, 27 Dec 2021 15:56:08 +0530 Subject: [PATCH 02/19] changes --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index d124bc4..46af979 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/magicstone-dev/acropolis/archive/2b1c78ae680abcf42aa6a859139009defda61c1c.tar.gz -SOURCE_SUM=552c3564085fbb6acb8a330477bdda5ab43535969651b5076f92e4036499dcbf +SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/a3dcee047d1687e6e4e265f50d51cf02d5125bce.tar.gz +SOURCE_SUM=6bb9c435024a7e313f93aedfeb26405271c87725e219934e3e541ffb46148f08 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From cf0f373861a9b7c5eb42ee7080324bb372ee4e74 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Mon, 27 Dec 2021 21:49:02 +0530 Subject: [PATCH 03/19] create initial admin --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index aa67482..49743bb 100644 --- a/scripts/install +++ b/scripts/install @@ -255,7 +255,7 @@ pushd "$final_path" ynh_exec_warn_less $rake_exec assets:precompile popd -ynh_script_progression --message="Create admin initial user..." +ynh_script_progression --message="Create initial admin user..." pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" From df7f3f641588edbaf67d4eec4317495232384a79 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Tue, 28 Dec 2021 15:35:05 +0530 Subject: [PATCH 04/19] create admin rake task changes --- bump-version.rb | 4 ++-- conf/app.src | 4 ++-- scripts/install | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bump-version.rb b/bump-version.rb index b2a5c65..c6237db 100755 --- a/bump-version.rb +++ b/bump-version.rb @@ -53,11 +53,11 @@ module Yunohost end end -github = JSON.parse(URI.parse('https://api.github.com/repos/magicstone-dev/acropolis/branches/main').read) +github = JSON.parse(URI.parse('https://api.github.com/repos/tms-phillips/acropolis/branches/bug/issue-97').read) last_commit = github["commit"]["sha"] version = Date.parse(github["commit"]["commit"]["author"]["date"]).to_s.gsub '-', '.' -url = "https://github.com/magicstone-dev/acropolis/archive/#{last_commit}.tar.gz" +url = "https://github.com/tms-phillips/acropolis/archive/#{last_commit}.tar.gz" puts "Downloading last commit at #{url}" release_file = URI.parse(url).read diff --git a/conf/app.src b/conf/app.src index 46af979..d166fda 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/a3dcee047d1687e6e4e265f50d51cf02d5125bce.tar.gz -SOURCE_SUM=6bb9c435024a7e313f93aedfeb26405271c87725e219934e3e541ffb46148f08 +SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/6fc5ad893b9c45e3147110c2d33ba8a1cb2c0c2d.tar.gz +SOURCE_SUM=2aa8eb92f0225b3cbceefeeb48ad2f7b8bba9a41f5e650d1947f0933383a7e67 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/install b/scripts/install index 49743bb..dbf56cc 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 @@ -256,10 +259,13 @@ pushd "$final_path" popd ynh_script_progression --message="Create initial admin user..." +ynh_script_progression --message=$admin +ynh_script_progression --message=$email +ynh_script_progression --message=$password pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" - ynh_exec_warn_less $rake_exec admin:create + ynh_exec_warn_less $rake_exec admin:create[$admin, $email, $password] popd #================================================= From 904a1a461d908cf2152718249977964f3b320ed2 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Tue, 28 Dec 2021 16:27:58 +0530 Subject: [PATCH 05/19] changes for create admin rake task --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index dbf56cc..4b2fc70 100644 --- a/scripts/install +++ b/scripts/install @@ -28,9 +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 +# 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 @@ -265,7 +265,7 @@ ynh_script_progression --message=$password pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" - ynh_exec_warn_less $rake_exec admin:create[$admin, $email, $password] + ynh_exec_warn_less $rake_exec admin:create['thomas', 'thomas@yopmail.com', 'password'] #[$admin, $email, $password] popd #================================================= From 5ac7a24ba48770ee88c16845ff0bd6cfc7318766 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Tue, 28 Dec 2021 18:07:00 +0530 Subject: [PATCH 06/19] changes --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 4b2fc70..e30ba9d 100644 --- a/scripts/install +++ b/scripts/install @@ -259,9 +259,9 @@ pushd "$final_path" popd ynh_script_progression --message="Create initial admin user..." -ynh_script_progression --message=$admin -ynh_script_progression --message=$email -ynh_script_progression --message=$password +# ynh_script_progression --message=$admin +# ynh_script_progression --message=$email +# ynh_script_progression --message=$password pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" From 5bc7c46e5d792b741ed642deea30c3a7ccaeb66a Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Tue, 28 Dec 2021 20:01:28 +0530 Subject: [PATCH 07/19] changes --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e30ba9d..77c1b2d 100644 --- a/scripts/install +++ b/scripts/install @@ -265,7 +265,10 @@ ynh_script_progression --message="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 admin:create['thomas', 'thomas@yopmail.com', 'password'] #[$admin, $email, $password] + ynh_exec_warn_less $rake_exec admin:create <<< "'thomas' + 'thomas@yopmail.com' + 'password' + " #[$admin, $email, $password] popd #================================================= From bff4361e7dc537b4da6f19f507e3670e9534c52e Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 15:32:32 +0530 Subject: [PATCH 08/19] changes --- scripts/install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 77c1b2d..a04958e 100644 --- a/scripts/install +++ b/scripts/install @@ -265,10 +265,7 @@ ynh_script_progression --message="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 admin:create <<< "'thomas' - 'thomas@yopmail.com' - 'password' - " #[$admin, $email, $password] + ynh_exec_warn_less $rake_exec admin:create <<< ["thomas", "thomas@yopmail.com", "password"] #[$admin, $email, $password] popd #================================================= From 31c3f2bee529e10f8157f87b3189d255cfbc7145 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 16:18:16 +0530 Subject: [PATCH 09/19] changes --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index d166fda..c5433f0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/6fc5ad893b9c45e3147110c2d33ba8a1cb2c0c2d.tar.gz -SOURCE_SUM=2aa8eb92f0225b3cbceefeeb48ad2f7b8bba9a41f5e650d1947f0933383a7e67 +SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/dbfc0eb0c63f83fec1eee4ad587159d809fd7b3e.tar.gz +SOURCE_SUM=4263c4e7a6b21d79e3d94d1649e0e87af2eb5420376c740e41a3a218f9b12911 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From c77d934bf78c14e47be32fd08bce457659122957 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 17:18:35 +0530 Subject: [PATCH 10/19] changes --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a04958e..83e5a69 100644 --- a/scripts/install +++ b/scripts/install @@ -265,7 +265,7 @@ ynh_script_progression --message="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 admin:create <<< ["thomas", "thomas@yopmail.com", "password"] #[$admin, $email, $password] + ynh_exec_warn_less $rake_exec admin:create #<<< ["thomas", "thomas@yopmail.com", "password"] #[$admin, $email, $password] popd #================================================= From a5c5fa11d190313251ab37ba649bd83bed688cb1 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 22:02:43 +0530 Subject: [PATCH 11/19] changes --- conf/app.src | 4 ++-- scripts/install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index c5433f0..03f0334 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/dbfc0eb0c63f83fec1eee4ad587159d809fd7b3e.tar.gz -SOURCE_SUM=4263c4e7a6b21d79e3d94d1649e0e87af2eb5420376c740e41a3a218f9b12911 +SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/8a8cabc606c04981b8ac5afe84f61cac7d97a952.tar.gz +SOURCE_SUM=2b12854a8d5f6d4e0f5e9753ffa69d0604bd89a7c11809e732c6a75b95a969ee SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/install b/scripts/install index 83e5a69..d3917ed 100644 --- a/scripts/install +++ b/scripts/install @@ -265,7 +265,7 @@ ynh_script_progression --message="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 admin:create #<<< ["thomas", "thomas@yopmail.com", "password"] #[$admin, $email, $password] + ynh_exec_warn_less $rake_exec "admin:create[thomas, thomas@yopmail.com, password]" popd #================================================= From 42e3d879e9b9de96dd7a94785509f712e245e0f8 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:12:29 +0530 Subject: [PATCH 12/19] changes --- scripts/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d3917ed..6353b93 100644 --- a/scripts/install +++ b/scripts/install @@ -28,10 +28,12 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -# admin=$YNH_APP_ARG_ADMIN +admin=$YNH_APP_ARG_ADMIN # email=$YNH_APP_ARG_EMAIL # password=$YNH_APP_ARG_PASSWORD +ynh_script_progression --message="testing.... $domain" --weight=1 + ### 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 ### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2"...) From 3c27915f15ed42dd07e177b66fe6a5760daaa875 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:19:40 +0530 Subject: [PATCH 13/19] changes --- manifest.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 67a257b..2b5ca0e 100644 --- a/manifest.json +++ b/manifest.json @@ -37,7 +37,11 @@ "help": { "en": "For federation to work, this needs to be true. False is ok if you want to run a private instance." } - } + }, + { + "name": "admin", + "type": "string" + }, ] } } From b7aa3bfbd7711dd32a5d4a2d67bae66c8841b0a6 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:23:56 +0530 Subject: [PATCH 14/19] changes --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2b5ca0e..22ee60b 100644 --- a/manifest.json +++ b/manifest.json @@ -40,7 +40,7 @@ }, { "name": "admin", - "type": "string" + "type": "user" }, ] } From 7df2c80b08ee9ecdfe45f68063acc40d2fec5a6a Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:28:55 +0530 Subject: [PATCH 15/19] changes --- manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index 22ee60b..99d0000 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.02~ynh1", + "version": "2021.12.29~ynh2", "url": "https://github.com/magicstone-dev/acropolis", "upstream": { "license": "free", @@ -30,6 +30,10 @@ "name": "domain", "type": "domain" }, + { + "name": "admin", + "type": "user" + }, { "name": "is_public", "type": "boolean", @@ -37,11 +41,7 @@ "help": { "en": "For federation to work, this needs to be true. False is ok if you want to run a private instance." } - }, - { - "name": "admin", - "type": "user" - }, + } ] } } From dfb712305265398d10dd5b0e77556ba84a4bac04 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:30:14 +0530 Subject: [PATCH 16/19] changes --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6353b93..7aace21 100644 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,7 @@ admin=$YNH_APP_ARG_ADMIN # email=$YNH_APP_ARG_EMAIL # password=$YNH_APP_ARG_PASSWORD -ynh_script_progression --message="testing.... $domain" --weight=1 +ynh_script_progression --message="testing.... $admin" --weight=1 ### 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 From 294203af56a5ca63335d2502edde88fe66d55638 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:33:51 +0530 Subject: [PATCH 17/19] changes --- manifest.json | 10 +++++++++- scripts/install | 13 ++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index 99d0000..ea41f6f 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,15 @@ "type": "domain" }, { - "name": "admin", + "name": "username", + "type": "user" + }, + { + "name": "email", + "type": "user" + }, + { + "name": "password", "type": "user" }, { diff --git a/scripts/install b/scripts/install index 7aace21..e113b9e 100644 --- a/scripts/install +++ b/scripts/install @@ -28,11 +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 - -ynh_script_progression --message="testing.... $admin" --weight=1 +username=$YNH_APP_ARG_USERNAME +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 @@ -261,13 +259,10 @@ pushd "$final_path" popd ynh_script_progression --message="Create initial admin user..." -# ynh_script_progression --message=$admin -# ynh_script_progression --message=$email -# ynh_script_progression --message=$password pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" - ynh_exec_warn_less $rake_exec "admin:create[thomas, thomas@yopmail.com, password]" + ynh_exec_warn_less $rake_exec "admin:create[$username, $email, $password]" popd #================================================= From 684391cba09bc37f82d846658e2146013b8da00f Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:36:58 +0530 Subject: [PATCH 18/19] changes --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index ea41f6f..c6a1277 100644 --- a/manifest.json +++ b/manifest.json @@ -36,11 +36,11 @@ }, { "name": "email", - "type": "user" + "type": "email" }, { "name": "password", - "type": "user" + "type": "password" }, { "name": "is_public", From 2f723b0b4055d87d27c9072f14e583676d4d3227 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Thu, 30 Dec 2021 00:13:52 +0530 Subject: [PATCH 19/19] create initial admin --- bump-version.rb | 6 +++--- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 8 +------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/bump-version.rb b/bump-version.rb index c6237db..37dd75a 100755 --- a/bump-version.rb +++ b/bump-version.rb @@ -53,11 +53,11 @@ module Yunohost end end -github = JSON.parse(URI.parse('https://api.github.com/repos/tms-phillips/acropolis/branches/bug/issue-97').read) +github = JSON.parse(URI.parse('https://api.github.com/repos/magicstone-dev/acropolis/branches/main').read) last_commit = github["commit"]["sha"] version = Date.parse(github["commit"]["commit"]["author"]["date"]).to_s.gsub '-', '.' -url = "https://github.com/tms-phillips/acropolis/archive/#{last_commit}.tar.gz" +url = "https://github.com/magicstone-dev/acropolis/archive/#{last_commit}.tar.gz" puts "Downloading last commit at #{url}" release_file = URI.parse(url).read @@ -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/conf/app.src b/conf/app.src index 03f0334..d124bc4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tms-phillips/acropolis/archive/8a8cabc606c04981b8ac5afe84f61cac7d97a952.tar.gz -SOURCE_SUM=2b12854a8d5f6d4e0f5e9753ffa69d0604bd89a7c11809e732c6a75b95a969ee +SOURCE_URL=https://github.com/magicstone-dev/acropolis/archive/2b1c78ae680abcf42aa6a859139009defda61c1c.tar.gz +SOURCE_SUM=552c3564085fbb6acb8a330477bdda5ab43535969651b5076f92e4036499dcbf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c6a1277..b224f61 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.29~ynh2", + "version": "2021.12.02~ynh1", "url": "https://github.com/magicstone-dev/acropolis", "upstream": { "license": "free", diff --git a/scripts/install b/scripts/install index e113b9e..d7a1351 100644 --- a/scripts/install +++ b/scripts/install @@ -250,18 +250,12 @@ 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 -popd - -ynh_script_progression --message="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 "admin:create[$username, $email, $password]" popd