From b2f7880e97a8715fbc8c3f14b0b1dbbb6e8d3f55 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Jun 2021 14:02:37 +0200 Subject: [PATCH] Revert "Merge branch '2.6.2' into patch" This reverts commit f2ab02764e3379c20df7751cdeeaed4a41218f8a, reversing changes made to 4d74dee2d86ac27d2c047d8d4f16e354a155b24b. --- README.md | 3 ++- doc/DISCLAIMER.md | 3 ++- scripts/_common.sh | 20 ++++++++++---------- scripts/install | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a9b5bd6..e71113c 100644 --- a/README.md +++ b/README.md @@ -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 ![LDAP Login Popup](https://raw.githubusercontent.com/jonmbake/screenshots/master/discourse-ldap-auth/ldap_popup.png) + ## Documentation and resources * Official app website: http://Discourse.org diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 5ac5325..08c94c4 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -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 ![Disable Local](https://raw.githubusercontent.com/jonmbake/screenshots/master/discourse-ldap-auth/disable_local.png) ![LDAP Login Popup](https://raw.githubusercontent.com/jonmbake/screenshots/master/discourse-ldap-auth/ldap_popup.png) + diff --git a/scripts/_common.sh b/scripts/_common.sh index f09bcca..e2c7ad6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -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 @@ -380,10 +380,10 @@ ynh_install_ruby () { # Set environment for Ruby users echo "#rbenv - export RBENV_ROOT=$rbenv_install_dir - export PATH=\"$rbenv_install_dir/bin:$PATH\" - eval \"\$(rbenv init -)\" - #rbenv" > /etc/profile.d/rbenv.sh +export RBENV_ROOT=$rbenv_install_dir +export PATH=\"$rbenv_install_dir/bin:$PATH\" +eval \"\$(rbenv init -)\" +#rbenv" > /etc/profile.d/rbenv.sh # Load the environment eval "$(rbenv init -)" diff --git a/scripts/install b/scripts/install index fd3cb40..f4c4ecb 100644 --- a/scripts/install +++ b/scripts/install @@ -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