YunoHost-Apps/discourse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/discourse_ynh.git synced 2024-09-03 18:26:18 +02:00
Code Issues Activity Actions

Revert "Merge branch '2.6.2' into patch"

Browse source 
This reverts commit f2ab02764e, reversing
changes made to 4d74dee2d8.
This commit is contained in:
ericgaspar 2021-06-04 14:02:37 +02:00
parent f2ab02764e
commit b2f7880e97
No known key found for this signature in database
GPG key ID: 574F281483054D44
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -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") $ 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 #### 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) ![LDAP Login Popup](https://raw.githubusercontent.com/jonmbake/screenshots/master/discourse-ldap-auth/ldap_popup.png)
## Documentation and resources ## Documentation and resources
* Official app website: http://Discourse.org * Official app website: http://Discourse.org

3
doc/DISCLAIMER.md
View file

@ -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") $ 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 #### 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) ![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) ![LDAP Login Popup](https://raw.githubusercontent.com/jonmbake/screenshots/master/discourse-ldap-auth/ldap_popup.png)

20
scripts/_common.sh
View file

@ -270,11 +270,11 @@ ynh_install_ruby () {
ynh_print_info --message="rbenv already seems installed in \`$rbenv'." ynh_print_info --message="rbenv already seems installed in \`$rbenv'."
pushd "${rbenv%/*/*}" pushd "${rbenv%/*/*}"
if git remote -v 2>/dev/null | grep "https://github.com/rbenv/rbenv.git"; then 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 git pull -q --tags origin master
ynh_ruby_try_bash_extension ynh_ruby_try_bash_extension
else else
ynh_print_info --message="Reinstalling rbenv with Git..." ynh_print_info --message="Reinstalling rbenv with git..."
cd .. cd ..
ynh_secure_remove --file=$rbenv_install_dir ynh_secure_remove --file=$rbenv_install_dir
mkdir -p $rbenv_install_dir mkdir -p $rbenv_install_dir
@ -287,7 +287,7 @@ ynh_install_ruby () {
fi fi
popd popd
else else
ynh_print_info --message="Installing rbenv with Git..." ynh_print_info --message="Installing rbenv with git..."
mkdir -p $rbenv_install_dir mkdir -p $rbenv_install_dir
pushd $rbenv_install_dir pushd $rbenv_install_dir
git init -q git init -q
@ -308,7 +308,7 @@ ynh_install_ruby () {
fi fi
popd popd
else 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" mkdir -p "${rbenv_install_dir}/plugins"
git clone -q https://github.com/rbenv/ruby-build.git "${rbenv_install_dir}/plugins/ruby-build" git clone -q https://github.com/rbenv/ruby-build.git "${rbenv_install_dir}/plugins/ruby-build"
fi fi
@ -323,7 +323,7 @@ ynh_install_ruby () {
fi fi
popd popd
else 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" mkdir -p "${rbenv_install_dir}/plugins"
git clone -q https://github.com/tpope/rbenv-aliases.git "${rbenv_install_dir}/plugins/rbenv-aliase" git clone -q https://github.com/tpope/rbenv-aliases.git "${rbenv_install_dir}/plugins/rbenv-aliase"
fi fi
@ -338,7 +338,7 @@ ynh_install_ruby () {
fi fi
popd popd
else 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" mkdir -p "${rbenv_install_dir}/plugins"
git clone -q https://github.com/momo-lab/xxenv-latest.git "${rbenv_install_dir}/plugins/xxenv-latest" git clone -q https://github.com/momo-lab/xxenv-latest.git "${rbenv_install_dir}/plugins/xxenv-latest"
fi fi
@ -380,10 +380,10 @@ ynh_install_ruby () {
# Set environment for Ruby users # Set environment for Ruby users
echo "#rbenv echo "#rbenv
export RBENV_ROOT=$rbenv_install_dir export RBENV_ROOT=$rbenv_install_dir
export PATH=\"$rbenv_install_dir/bin:$PATH\" export PATH=\"$rbenv_install_dir/bin:$PATH\"
eval \"\$(rbenv init -)\" eval \"\$(rbenv init -)\"
#rbenv" > /etc/profile.d/rbenv.sh #rbenv" > /etc/profile.d/rbenv.sh
# Load the environment # Load the environment
eval "$(rbenv init -)" eval "$(rbenv init -)"

6
scripts/install
View file

@ -160,9 +160,9 @@ secret="$(ynh_string_random)"
ynh_add_config --template="../conf/secrets.yml" --destination="$final_path/config/secrets.yml" ynh_add_config --template="../conf/secrets.yml" --destination="$final_path/config/secrets.yml"
# Set permissions to app files # Set permissions to app files
# chmod 750 "$final_path" chmod 750 "$final_path"
# chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
# chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
pushd "$final_path" pushd "$final_path"
ynh_use_ruby ynh_use_ruby