From e7ed942684dd6b2cb0be509878048a85d8642f8d Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 30 Apr 2017 14:04:25 +0200
Subject: [enh] Switch to tagged release

---
 scripts/install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts/install')

diff --git a/scripts/install b/scripts/install
index f5522df..3357c1d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -85,13 +85,17 @@ sudo su -c "psql" postgres <<< \
 ynh_psql_create_db_without_password "$app"
 sudo systemctl restart postgresql
 
-# Download all Ruby source
+# Download all sources rbenv, ruby and mastodon
 sudo su - $app <<CLONECOMMANDS
 git clone https://github.com/rbenv/rbenv.git $final_path/.rbenv
 git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/ruby-build
 git clone https://github.com/tootsuite/mastodon.git $final_path/live
 CLONECOMMANDS
 
+# Switch to tagged release
+cd $final_path/live
+sudo git checkout $(git tag | tail -n 1)
+
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
 popd
 
-- 
cgit v1.2.3-70-g09d2


From 70d41205f334c3ce1e8fa4a9715caa2d5ed6c0cb Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Mon, 8 May 2017 11:06:33 +0200
Subject: [enh] Admin user creation tune (#25)

* [fix] Password lengh check 9 to 8

* [enh] Use the email address from admin user

* [fix] Confirm real admin mail

* Check TODO

* [fix] Warning password to 7
---
 README.md       | 3 ++-
 scripts/install | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'scripts/install')

diff --git a/README.md b/README.md
index 2b4d9ea..c7583c4 100644
--- a/README.md
+++ b/README.md
@@ -89,5 +89,6 @@ It seems important to close the inscriptions for your Mastodon, so that it remai
 - [x] [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed)
 - [x] Fix restore
 - [x] Install from a release
-- [ ] Tune [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed)
+- [x] Tune [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed)
+- [ ] Change SMTP settings
 - [ ] Fix errors on jenkins
diff --git a/scripts/install b/scripts/install
index 2fd4b23..7d060fd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -15,6 +15,7 @@ TRAP_ON	# Active trap to stop the script if an error is detected.
 
 domain=$YNH_APP_ARG_DOMAIN
 admin_mastodon=$YNH_APP_ARG_ADMIN
+admin_mastodon_mail=$(ynh_user_get_info $admin_mastodon 'mail')
 admin_pass=$YNH_APP_ARG_PASSWD
 language=$YNH_APP_ARG_LANGUAGE
 
@@ -33,8 +34,8 @@ ynh_app_setting_set $app admin $admin_mastodon
 ynh_app_setting_set $app pass $admin_pass
 ynh_app_setting_set $app language $language
 
-[[ ${#admin_pass} -gt 8 ]] || ynh_die \
-"The password is too weak, it must be longer than 8 characters"
+[[ ${#admin_pass} -gt 7 ]] || ynh_die \
+"The password is too weak, it must be longer than 7 characters"
 
 # Create user unix
 sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login
@@ -190,14 +191,14 @@ sudo su - $app <<UCOMMANDS
 pushd ~/live
 RAILS_ENV=production bundle exec rails c
 account = Account.create!(username: '$admin_mastodon')
-user = User.create!(email: '$admin_mastodon@$domain', password: '$admin_pass', account: account)
+user = User.create!(email: '$admin_mastodon_mail', password: '$admin_pass', account: account)
 UCOMMANDS
 
 # Create administrator & confirm user
 sudo su - $app <<ACOMMANDS
 pushd ~/live
 RAILS_ENV=production bin/bundle exec rails mastodon:make_admin USERNAME=$admin_mastodon
-RAILS_ENV=production bin/bundle exec rails mastodon:confirm_email USER_EMAIL=$admin_mastodon@$domain
+RAILS_ENV=production bin/bundle exec rails mastodon:confirm_email USER_EMAIL=$admin_mastodon_mail
 ACOMMANDS
 
 # Copy nginx config
-- 
cgit v1.2.3-70-g09d2