mirror of
https://github.com/YunoHost-Apps/discourse_ynh.git
synced 2024-09-03 18:26:18 +02:00
Revert "Merge branch '2.6.2' into patch"
This reverts commitf2ab02764e
, reversing changes made to4d74dee2d8
.
This commit is contained in:
parent
f2ab02764e
commit
b2f7880e97
4 changed files with 17 additions and 15 deletions
|
@ -59,7 +59,7 @@ $ RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails c
|
|||
$ UserEmail.create!(user: User.find_by_username("foo"), email: "foo@theirexternalmail.com")
|
||||
```
|
||||
|
||||
Discourse can now receive email from `foo@theirexternalmail.com` and give it to the user account with mail address `foo@myyunohostdomain.org`.
|
||||
Discourse can now receive mail from `foo@theirexternalmail.com` and give it to the user account with mail address `foo@myyunohostdomain.org`.
|
||||
|
||||
#### Multi-user support
|
||||
|
||||
|
@ -77,6 +77,7 @@ When disabling Local Login and other authentication services, clicking the `Logi
|
|||
|
||||

|
||||
|
||||
|
||||
## Documentation and resources
|
||||
|
||||
* Official app website: http://Discourse.org
|
||||
|
|
|
@ -30,7 +30,7 @@ $ RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails c
|
|||
$ UserEmail.create!(user: User.find_by_username("foo"), email: "foo@theirexternalmail.com")
|
||||
```
|
||||
|
||||
Discourse can now receive email from `foo@theirexternalmail.com` and give it to the user account with mail address `foo@myyunohostdomain.org`.
|
||||
Discourse can now receive mail from `foo@theirexternalmail.com` and give it to the user account with mail address `foo@myyunohostdomain.org`.
|
||||
|
||||
#### Multi-user support
|
||||
|
||||
|
@ -47,3 +47,4 @@ When disabling Local Login and other authentication services, clicking the `Logi
|
|||

|
||||
|
||||

|
||||
|
||||
|
|
|
@ -270,11 +270,11 @@ ynh_install_ruby () {
|
|||
ynh_print_info --message="rbenv already seems installed in \`$rbenv'."
|
||||
pushd "${rbenv%/*/*}"
|
||||
if git remote -v 2>/dev/null | grep "https://github.com/rbenv/rbenv.git"; then
|
||||
ynh_print_info --message="Trying to update with Git..."
|
||||
ynh_print_info --message="Trying to update with git..."
|
||||
git pull -q --tags origin master
|
||||
ynh_ruby_try_bash_extension
|
||||
else
|
||||
ynh_print_info --message="Reinstalling rbenv with Git..."
|
||||
ynh_print_info --message="Reinstalling rbenv with git..."
|
||||
cd ..
|
||||
ynh_secure_remove --file=$rbenv_install_dir
|
||||
mkdir -p $rbenv_install_dir
|
||||
|
@ -287,7 +287,7 @@ ynh_install_ruby () {
|
|||
fi
|
||||
popd
|
||||
else
|
||||
ynh_print_info --message="Installing rbenv with Git..."
|
||||
ynh_print_info --message="Installing rbenv with git..."
|
||||
mkdir -p $rbenv_install_dir
|
||||
pushd $rbenv_install_dir
|
||||
git init -q
|
||||
|
@ -308,7 +308,7 @@ ynh_install_ruby () {
|
|||
fi
|
||||
popd
|
||||
else
|
||||
ynh_print_info --message="Installing ruby-build with Git..."
|
||||
ynh_print_info --message="Installing ruby-build with git..."
|
||||
mkdir -p "${rbenv_install_dir}/plugins"
|
||||
git clone -q https://github.com/rbenv/ruby-build.git "${rbenv_install_dir}/plugins/ruby-build"
|
||||
fi
|
||||
|
@ -323,7 +323,7 @@ ynh_install_ruby () {
|
|||
fi
|
||||
popd
|
||||
else
|
||||
ynh_print_info --message="Installing rbenv-aliases with Git..."
|
||||
ynh_print_info --message="Installing rbenv-aliases with git..."
|
||||
mkdir -p "${rbenv_install_dir}/plugins"
|
||||
git clone -q https://github.com/tpope/rbenv-aliases.git "${rbenv_install_dir}/plugins/rbenv-aliase"
|
||||
fi
|
||||
|
@ -338,7 +338,7 @@ ynh_install_ruby () {
|
|||
fi
|
||||
popd
|
||||
else
|
||||
ynh_print_info --message="Installing xxenv-latest with Git..."
|
||||
ynh_print_info --message="Installing xxenv-latest with git..."
|
||||
mkdir -p "${rbenv_install_dir}/plugins"
|
||||
git clone -q https://github.com/momo-lab/xxenv-latest.git "${rbenv_install_dir}/plugins/xxenv-latest"
|
||||
fi
|
||||
|
|
|
@ -160,9 +160,9 @@ secret="$(ynh_string_random)"
|
|||
ynh_add_config --template="../conf/secrets.yml" --destination="$final_path/config/secrets.yml"
|
||||
|
||||
# Set permissions to app files
|
||||
# chmod 750 "$final_path"
|
||||
# chmod -R o-rwx "$final_path"
|
||||
# chown -R $app:www-data "$final_path"
|
||||
chmod 750 "$final_path"
|
||||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
pushd "$final_path"
|
||||
ynh_use_ruby
|
||||
|
|
Loading…
Add table
Reference in a new issue