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

[enh] Download Movim source code with git with local helpers

Browse source 
Instead of using a git submodule attached to this app, the Movim source
code is downloaded using git - as suggested in the Movim Wiki. It fixes by
the way the upgrade which was broken before that.
It also adds `scripts/_common.sh` which defines common variables and
functions.
This commit is contained in:
Jérôme Lebleu 2016-07-10 17:34:37 +02:00
parent 3f86f21273
commit 9ae09c9f4e
5 changed files with 86 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "sources"]
path = sources
url = git@github.com:movim/movim.git

23
scripts/_common.sh Normal file
View file

@ -0,0 +1,23 @@
#
# Common variables
#
# Git repository of Movim
GIT_REPO="https://github.com/movim/movim"
# Commit to checkout
HEAD_COMMIT="512523576b03c2c8952305e70681ed31172b9fd2"
# Source code destination directory
DESTDIR="/var/www/movim"
#
# Common helpers
#
# Execute a command as movim user in the destination directory
# usage: exec_cmd COMMAND [ARG ...]
exec_cmd() {
(cd "$DESTDIR" \
&& sudo sudo -u movim "$@")
}

66
scripts/install
View file

@ -15,8 +15,9 @@ ssoenabled=$6
port=$7 port=$7
timezone=`cat /etc/timezone` timezone=`cat /etc/timezone`
# Source YunoHost helpers # Source YunoHost and local helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
source ./_common.sh
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl "${domain}${path}" -a "$app" \ sudo yunohost app checkurl "${domain}${path}" -a "$app" \
@ -59,36 +60,49 @@ ynh_mysql_create_db "$db_name" "$db_user" "$db_pwd"
# Install packages # Install packages
ynh_package_install php5-gd php5-curl php5-imagick php5-cli ynh_package_install php5-gd php5-curl php5-imagick php5-cli
# Copy Movim source files # Download Movim source code
final_path=/var/www/movim tmp_path=/tmp/movim-git
sudo cp -a ../sources "$final_path" sudo rm -rf "$tmp_path"
sudo cp "${final_path}/config/"{db.example.inc.php,db.inc.php} (git clone --quiet "$GIT_REPO" "$tmp_path" \
&& cd "$tmp_path" && git checkout --quiet "$HEAD_COMMIT") \
|| ynh_die "Unable to download Movim source code."
# Set database configuration
cp "${tmp_path}/config/"{db.example.inc.php,db.inc.php}
sed -i "s@'username' => 'username'@'username' => '$db_user'@g" \
"${tmp_path}/config/db.inc.php"
sed -i "s@'password' => 'password'@'password' => '$db_pwd'@g" \
"${tmp_path}/config/db.inc.php"
## FIXME: consider installation in a subpath
sed -i "s@'/ws/'@'${path%/}/ws/'@g" \
"${tmp_path}/app/assets/js/movim_websocket.js"
# Move Movim source code
sudo mv "$tmp_path" "$DESTDIR"
# Create movim system user and set permissions # Create movim system user and set permissions
sudo useradd -d /var/www/movim -s /bin/sh movim sudo useradd -d /var/www/movim -s /bin/sh movim
sudo chown -R movim:www-data "$final_path" sudo chown -R movim:www-data "$DESTDIR"
sudo find "${final_path}/" -type f -print0 | sudo xargs -0 chmod 0640 sudo find "${DESTDIR}/" -type f -print0 | sudo xargs -0 chmod 0644
sudo find "${final_path}/" -type d -print0 | sudo xargs -0 chmod 0750 sudo find "${DESTDIR}/" -type d -print0 | sudo xargs -0 chmod 0755
sudo chmod 400 "${DESTDIR}/config/db.inc.php"
# Install PHP dependencies # Install PHP dependencies using composer
sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" movim (curl -sS https://getcomposer.org/installer \
sudo su -c "cd $final_path && php composer.phar config --global discard-changes true" movim # auto yes | exec_cmd php -- --quiet --install-dir="$DESTDIR" \
sudo su -c "cd $final_path && php composer.phar install -n" movim # install + quiet mode && exec_cmd php composer.phar config --global discard-changes true \
&& exec_cmd php composer.phar install -n) \
|| ynh_die "Unable to install Movim dependencies."
# Movim configuration # Set Movim database and configuration
sudo sed -i "s@'username' => 'username'@'username' => '$db_user'@g" $final_path/config/db.inc.php exec_cmd php mud.php db --set
sudo sed -i "s@'password' => 'password'@'password' => '$db_pwd'@g" $final_path/config/db.inc.php exec_cmd php mud.php config --loglevel=1 \
sudo sed -i "s@/ws/@$path/ws/@g" $final_path/app/assets/js/movim_websocket.js --locale="$language" --timezone="$timezone" \
sudo su -c "cd $final_path && php mud.php db --set" movim --username="$admin" --password="$password"
sudo su -c "cd $final_path && php mud.php config --locale=$language" movim
sudo su -c "cd $final_path && php mud.php config --loglevel=1" movim
sudo su -c "cd $final_path && php mud.php config --timezone=$timezone" movim
sudo su -c "cd $final_path && php mud.php config --username=$admin" movim
sudo su -c "cd $final_path && php mud.php config --password=$password" movim
# Copy init script or systemd service # Copy init script or systemd service
sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init} sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init}
sudo sed -i "s@YHDIR@$final_path@g" ../conf/movim.{service,init} sudo sed -i "s@YHDIR@$DESTDIR@g" ../conf/movim.{service,init}
sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init} sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init}
initcheck=`pgrep -ox systemd` initcheck=`pgrep -ox systemd`
if [ "$initcheck" = "1" ]; if [ "$initcheck" = "1" ];
@ -109,7 +123,7 @@ sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/movim.conf
# Nginx configuration # Nginx configuration
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sed -i "s@ALIASTOCHANGE@$DESTDIR/@g" ../conf/nginx.conf
sed -i "s@YHPORT@$port@g" ../conf/nginx.conf sed -i "s@YHPORT@$port@g" ../conf/nginx.conf
sed -i "s@//ws/@/ws/@g" ../conf/nginx.conf # Avoid duplicate / sed -i "s@//ws/@/ws/@g" ../conf/nginx.conf # Avoid duplicate /
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf
@ -118,11 +132,11 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf
if [ $ssoenabled = "No" ]; if [ $ssoenabled = "No" ];
then then
ynh_app_setting_set "$app" skipped_uris "/" ynh_app_setting_set "$app" skipped_uris "/"
sudo su -c "cd $final_path && php mud.php config --xmppwhitelist=$domain" movim exec_cmd php mud.php config --xmppwhitelist=$domain
else else
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
# Next line is to avoid SSO to auto-connect just after disconnect # Next line is to avoid SSO to auto-connect just after disconnect
sudo sed -i "s@redirect('login')@redirect('')@g" $final_path/app/controllers/DisconnectController.php sudo sed -i "s@redirect('login')@redirect('')@g" $DESTDIR/app/controllers/DisconnectController.php
fi fi
# Start Movim # Start Movim

42
scripts/upgrade
View file

@ -5,8 +5,9 @@ set -eu
app="movim" app="movim"
# Source YunoHost helpers # Source YunoHost and local helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
source ./_common.sh
# Retrieve app settings # Retrieve app settings
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
@ -21,26 +22,29 @@ timezone=`cat /etc/timezone`
|| ynh_die "Could not detect timezone, please check /etc/timezone." \ || ynh_die "Could not detect timezone, please check /etc/timezone." \
&& echo "Detected timezone: $timezone" && echo "Detected timezone: $timezone"
# Copy Movim source files # Update Movim source code
final_path=/var/www/movim (exec_cmd git fetch --quiet origin \
sudo cp -a ../sources "$final_path" && exec_cmd git reset --quiet --hard "$HEAD_COMMIT") \
|| ynh_die "Unable to download Movim source code."
## FIXME: consider installation in a subpath
exec_cmd sed -i "s@'/ws/'@'${path%/}/ws/'@g" \
"${DESTDIR}/app/assets/js/movim_websocket.js"
# Create movim user if not exists and set permissions # Create movim user if not exists and set permissions
ynh_system_user_exists movim \ ynh_system_user_exists movim \
|| sudo useradd -d /var/www/movim -s /bin/sh movim || sudo useradd -d /var/www/movim -s /bin/sh movim
sudo chown -R movim:www-data "$final_path" sudo chown -R movim:www-data "$DESTDIR"
sudo find "${final_path}/" -type f -print0 | sudo xargs -0 chmod 0640 sudo find "${DESTDIR}/" -type f -print0 | sudo xargs -0 chmod 0644
sudo find "${final_path}/" -type d -print0 | sudo xargs -0 chmod 0750 sudo find "${DESTDIR}/" -type d -print0 | sudo xargs -0 chmod 0755
sudo chmod 400 "${DESTDIR}/config/db.inc.php"
# Update PHP dependencies # Update PHP dependencies using composer
sudo su -c "cd $final_path && php composer.phar config --global discard-changes true" movim (exec_cmd php composer.phar config --global discard-changes true \
sudo su -c "cd $final_path && php composer.phar install -n" movim && exec_cmd php composer.phar install -n) \
|| ynh_die "Unable to update Movim dependencies."
# Movim configuration # Upgrade Movim database as needed
sudo sed -i "s@/ws/@$path/ws/@g" $final_path/app/assets/js/movim_websocket.js exec_cmd php mud.php db --set
# Upgrade db if necessary
sudo su -c "cd $final_path && php mud.php db --set" movim
# Reset SSO parameters # Reset SSO parameters
ynh_app_setting_delete "$app" protected_uris ynh_app_setting_delete "$app" protected_uris
@ -62,16 +66,16 @@ fi
if [ $ssoenabled = "No" ]; if [ $ssoenabled = "No" ];
then then
ynh_app_setting_set "$app" skipped_uris "/" ynh_app_setting_set "$app" skipped_uris "/"
sudo su -c "cd $final_path && php mud.php config --xmppwhitelist=$domain" movim exec_cmd php mud.php config --xmppwhitelist=$domain
else else
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
# Next line is to avoid SSO to auto-connect just after disconnect # Next line is to avoid SSO to auto-connect just after disconnect
sudo sed -i "s@redirect('login')@redirect('')@g" $final_path/app/controllers/DisconnectController.php sudo sed -i "s@redirect('login')@redirect('')@g" $DESTDIR/app/controllers/DisconnectController.php
fi fi
# Update init scripts # Update init scripts
sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init} sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init}
sudo sed -i "s@YHDIR@$final_path@g" ../conf/movim.{service,init} sudo sed -i "s@YHDIR@$DESTDIR@g" ../conf/movim.{service,init}
sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init} sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init}
initcheck=`pgrep -ox systemd` initcheck=`pgrep -ox systemd`
if [ "$initcheck" = "1" ]; if [ "$initcheck" = "1" ];
@ -93,7 +97,7 @@ sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/movim.conf
# Nginx configuration # Nginx configuration
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sed -i "s@ALIASTOCHANGE@$DESTDIR/@g" ../conf/nginx.conf
sed -i "s@YHPORT@$port@g" ../conf/nginx.conf sed -i "s@YHPORT@$port@g" ../conf/nginx.conf
sed -i "s@//ws/@/ws/@g" ../conf/nginx.conf # Avoid duplicate / sed -i "s@//ws/@/ws/@g" ../conf/nginx.conf # Avoid duplicate /
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf

1
sources

@ -1 +0,0 @@
Subproject commit 512523576b03c2c8952305e70681ed31172b9fd2