1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/openproject_ynh.git synced 2024-09-03 19:56:10 +02:00

hotfix typo bundle

This commit is contained in:
Geoff Montel 2019-10-01 22:36:58 +02:00
parent a243f72445
commit 899fe22f91
3 changed files with 57 additions and 42 deletions

View file

@ -10,6 +10,16 @@ pkg_dependencies="zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS
#================================================= #=================================================
exec_as() {
local USER=$1
shift 1
if [[ $USER = $(whoami) ]]; then
eval "$@"
else
sudo -u "$USER" sh -c ". ~/.profile && $@"
fi
}
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS

View file

@ -78,37 +78,38 @@ ynh_install_app_dependencies $pkg_dependencies
ynh_script_progression --message="Setting up Rbenv and Nodenv..." --weight=1 ynh_script_progression --message="Setting up Rbenv and Nodenv..." --weight=1
# 1: Ruby # 1: Ruby
sudo -iu $app git clone -q https://github.com/rbenv/rbenv.git $_homedir/.rbenv exec_as $app git clone -q https://github.com/rbenv/rbenv.git $_homedir/.rbenv
sudo -iu $app git clone -q https://github.com/rbenv/ruby-build.git $_homedir/.rbenv/plugins/ruby-build exec_as $app git clone -q https://github.com/rbenv/ruby-build.git $_homedir/.rbenv/plugins/ruby-build
# 2: Node # 2: Node
sudo -iu $app git clone -q https://github.com/nodenv/nodenv.git $_homedir/.nodenv exec_as $app git clone -q https://github.com/nodenv/nodenv.git $_homedir/.nodenv
sudo -iu $app git clone -q git://github.com/nodenv/node-build.git $_homedir/.nodenv/plugins/node-build exec_as $app git clone -q git://github.com/nodenv/node-build.git $_homedir/.nodenv/plugins/node-build
cat >> $_homedir/.profile << EOF cat >> $_homedir/.profile << EOF
export PATH="$_homedir/.nodenv/bin:$_homedir/.rbenv/bin:$PATH" export PATH="$_homedir/.nodenv/bin:$_homedir/.rbenv/bin:$PATH"
eval "\$(rbenv init -)" eval "\$(rbenv init -)"
eval "\$(nodenv init -)" eval "\$(nodenv init -)"
RAILS_ENV="production"
EOF EOF
chown $app: $_homedir/.profile chown $app: $_homedir/.profile
sudo -iu $app bash $_homedir/.profile exec_as $app bash $_homedir/.profile
ynh_script_progression --message="Setting up Ruby and Node..." --weight=1 ynh_script_progression --message="Setting up Ruby and Node..." --weight=1
# 3: Ruby setup # 3: Ruby setup
sudo -iu $app rbenv install 2.6.4 > /dev/null exec_as $app rbenv install 2.6.4 > /dev/null
sudo -iu $app rbenv rehash exec_as $app rbenv rehash
sudo -iu $app rbenv global 2.6.4 exec_as $app rbenv global 2.6.4
# 3: Node setup # 3: Node setup
sudo -iu $app nodenv install 12.11.0 > /dev/null exec_as $app nodenv install 12.11.0 > /dev/null
sudo -iu $app nodenv rehash exec_as $app nodenv rehash
sudo -iu $app nodenv global 12.11.0 exec_as $app nodenv global 12.11.0
# Test result # Test result
sudo -iu $app ruby --version >/dev/null 2>&1 || ynh_die "Ruby installation failed with rubyenv" exec_as $app ruby --version >/dev/null 2>&1 || ynh_die "Ruby installation failed with rubyenv"
sudo -iu $app node --version >/dev/null 2>&1 || ynh_die "Node installation failed with nodenv" exec_as $app node --version >/dev/null 2>&1 || ynh_die "Node installation failed with nodenv"
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -134,7 +135,7 @@ db_pwd=$(ynh_string_random) # Generate a random password
ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name
db_user=$db_name db_user=$db_name
ynh_script_progression --message="Configuring OpenProject..." --weight=1 ynh_script_progression --message="Configuring OpenProject..." --weight=1
sudo -iu $app cat >> $final_path/config/database.yml << EOF exec_as $app cat >> $final_path/config/database.yml << EOF
production: production:
adapter: postgresql adapter: postgresql
database: $db_name database: $db_name
@ -147,7 +148,7 @@ EOF
ynh_store_file_checksum --file="$final_path/config/database.yml" ynh_store_file_checksum --file="$final_path/config/database.yml"
#TODO Not sure aout this email sending. To be tested. #TODO Not sure aout this email sending. To be tested.
sudo -iu $app cat >> $final_path/config/configuration.yml << EOF exec_as $app cat >> $final_path/config/configuration.yml << EOF
production: production:
# Outgoing emails configuration (see examples above) # Outgoing emails configuration (see examples above)
email_delivery_method: :smtp email_delivery_method: :smtp
@ -165,28 +166,28 @@ ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1
ynh_app_setting_set --app=$app --key=dbpwd --value=$db_pwd # Store the password in the app's config ynh_app_setting_set --app=$app --key=dbpwd --value=$db_pwd # Store the password in the app's config
sudo -u postgres psql -c "CREATE USER $app WITH PASSWORD '$db_pwd';" ynh_exec_as postgres psql -c "CREATE USER $app WITH PASSWORD '$db_pwd';"
sudo -u postgres createdb -O $app $db_name ynh_exec_as postgres createdb -O $app $db_name
#================================================= #=================================================
# RUBY POST-INSTALL # RUBY POST-INSTALL
#================================================= #=================================================
ynh_script_progression --message="Compiling OpenProject with NPM and RUBYGems..." --weight=1 ynh_script_progression --message="Compiling OpenProject with NPM and RUBYGems..." --weight=1
sudo -iu $app gem update --system
sudo -iu $app gem install puma exec_as $app gem update --system
# TODO Remove if test success sudo -iu $app gem install bundler
sudo -iu $app install --deployment --without development test therubyracer docker pushd $final_path
sudo -iu $app npm install exec_as $app gem install puma
# TODO Remove if test success exec_as $app gem install bundler
exec_as $app bundle install --deployment --without development test therubyracer docker
exec_as $app npm install
ynh_script_progression --message="Provisioning assets..." --weight=1 ynh_script_progression --message="Provisioning assets..." --weight=1
pushd $final_path exec_as $app ./bin/rake db:create
sudo -iu $app RAILS_ENV="production" ./bin/rake db:create exec_as $app ./bin/rake db:migrate
sudo -iu $app RAILS_ENV="production" ./bin/rake db:migrate exec_as $app ./bin/rake LOCALE=$language db:seed
sudo -iu $app RAILS_ENV="production" ./bin/rake LOCALE=$language db:seed exec_as $app ./bin/rake assets:precompile
sudo -iu $app RAILS_ENV="production" ./bin/rake assets:precompile
echo "export SECRET_KEY_BASE=$(./bin/rake secret)" >> /etc/environment echo "export SECRET_KEY_BASE=$(./bin/rake secret)" >> /etc/environment
. /etc/environment . /etc/environment

View file

@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
# LOAD SETTINGS # LOAD SETTINGS
#================================================= #=================================================
ynh_script_progression --message="Loading installation settings..." --time --weight=1 ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -22,7 +22,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_user=$db_name db_user=$db_name
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
local _homedir = /var/$app _homedir=/var/$app
#================================================= #=================================================
# STANDARD REMOVE # STANDARD REMOVE
@ -33,14 +33,14 @@ local _homedir = /var/$app
# Remove a service from the admin panel, added by `yunohost service add` # Remove a service from the admin panel, added by `yunohost service add`
if ynh_exec_warn_less yunohost service status $app >/dev/null if ynh_exec_warn_less yunohost service status $app >/dev/null
then then
ynh_script_progression --message="Removing $app service..." --time --weight=1 ynh_script_progression --message="Removing $app service..." --weight=1
yunohost service remove $app yunohost service remove $app
fi fi
#================================================= #=================================================
# STOP AND REMOVE SERVICE # STOP AND REMOVE SERVICE
#================================================= #=================================================
/ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1 /ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
# Remove the dedicated systemd config # Remove the dedicated systemd config
ynh_remove_systemd_config ynh_remove_systemd_config
@ -48,15 +48,19 @@ ynh_remove_systemd_config
#================================================= #=================================================
# REMOVE THE POSTGRESQL DATABASE # REMOVE THE POSTGRESQL DATABASE
#================================================= #=================================================
ynh_script_progression --message="Removing the PostgreSQL database..." --time --weight=1 ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1
# Remove a database if it exists, along with the associated user # Remove a database if it exists, along with the associated user
sudo -u postgres dropdb $db_name [ -z $db_name ] || ynh_exec_as postgres dropdb $db_name
# If DBMS is empty, remove it.
_remaining_databases=$(sudo -iu postgres psql -l | grep "^(" | sed "s/^(\([^ ]*\) .*/\1/")
[ $_remaining_databases -lt 3] && apt remove postgresql postgresq-contribl
#================================================= #=================================================
# REMOVE DEPENDENCIES # REMOVE DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Removing dependencies..." --time --weight=1 ynh_script_progression --message="Removing dependencies..." --weight=1
# Remove metapackage and its dependencies # Remove metapackage and its dependencies
ynh_remove_app_dependencies ynh_remove_app_dependencies
@ -64,7 +68,7 @@ ynh_remove_app_dependencies
#================================================= #=================================================
# REMOVE APP MAIN DIR # REMOVE APP MAIN DIR
#================================================= #=================================================
ynh_script_progression --message="Removing app main directory..." --time --weight=1 ynh_script_progression --message="Removing app main directory..." --weight=1
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove --file="$final_path" ynh_secure_remove --file="$final_path"
@ -73,7 +77,7 @@ ynh_secure_remove --file="$_homedir"
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # REMOVE NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1 ynh_script_progression --message="Removing nginx web server configuration..." --weight=1
# Remove the dedicated nginx config # Remove the dedicated nginx config
ynh_remove_nginx_config ynh_remove_nginx_config
@ -81,7 +85,7 @@ ynh_remove_nginx_config
#================================================= #=================================================
# REMOVE LOGROTATE CONFIGURATION # REMOVE LOGROTATE CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1 ynh_script_progression --message="Removing logrotate configuration..." --weight=1
# Remove the app-specific logrotate config # Remove the app-specific logrotate config
ynh_remove_logrotate ynh_remove_logrotate
@ -89,7 +93,7 @@ ynh_remove_logrotate
#================================================= #=================================================
# REMOVE FAIL2BAN CONFIGURATION # REMOVE FAIL2BAN CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Removing fail2ban configuration..." --time --weight=1 ynh_script_progression --message="Removing fail2ban configuration..." --weight=1
# Remove the dedicated fail2ban config # Remove the dedicated fail2ban config
ynh_remove_fail2ban_config ynh_remove_fail2ban_config
@ -99,7 +103,7 @@ ynh_remove_fail2ban_config
#================================================= #=================================================
# REMOVE DEDICATED USER # REMOVE DEDICATED USER
#================================================= #=================================================
ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 ynh_script_progression --message="Removing the dedicated system user..." --weight=1
# Delete a system user # Delete a system user
ynh_system_user_delete --username=$app ynh_system_user_delete --username=$app
@ -108,4 +112,4 @@ ynh_system_user_delete --username=$app
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Removal of $app completed" --time --last ynh_script_progression --message="Removal of $app completed" --last