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

- re-use scith Workaround for sso

Browse source 
- use data/VERSION configure rainloop version in index.php
- change in upgrade process...
This commit is contained in:
Djip007 2015-10-22 20:55:36 +02:00
parent 805bedc606
commit aff7fe1c86
5 changed files with 78 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/install
View file

@ -41,8 +41,8 @@ sudo yunohost app setting rainloop mysqlpwd -v $db_pwd
# Copy files to the right place # Copy files to the right place
final_path=/var/www/$app final_path=/var/www/$app
#rainloop_path=${final_path}/app rainloop_path=${final_path}/app
rainloop_path=${final_path} #rainloop_path=${final_path}
sudo rm -rf $final_path sudo rm -rf $final_path
sudo mkdir -p $final_path sudo mkdir -p $final_path
@ -87,18 +87,23 @@ sudo cp -rf ../sources/plugins/ynh-login-mapping $rainloop_path/data/_data_/_def
# Hooks for domains are not implemented yet, so new domains will not be added automatically # Hooks for domains are not implemented yet, so new domains will not be added automatically
# SSO # install SSO and auto version
#sudo cp ../conf/sso.php $final_path/index.php if [ $final_path == $rainloop_path ]
sudo cp ../sources/sso/index.php $final_path/index.php then
# use modified version of master index.php that implement sso
sudo cp ../sources/sso/index.php $final_path/index.php sudo cp ../sources/sso/index.php $final_path/index.php
else
# use only sso on master
sudo cp ../sources/sso/sso.php $final_path/index.php
sudo cp ../sources/patch/index_auto_version.php $rainloop_path/index.php
fi
sudo sed -i "s@domain.tld@$domain@g" $final_path/index.php sudo sed -i "s@domain.tld@$domain@g" $final_path/index.php
sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/index.php sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/index.php
# Set permissions to rainloop directory # Set permissions to rainloop directory
# sudo mkdir -p $final_path/logs
sudo chown -R www-data:www-data $final_path sudo chown -R www-data:www-data $final_path
# Modify Nginx configuration file and copy it to Nginx conf directory # Install Nginx configuration file
nginx_conf_file=/etc/nginx/conf.d/$domain.d/$app.conf nginx_conf_file=/etc/nginx/conf.d/$domain.d/$app.conf
sudo cp ../conf/nginx.conf $nginx_conf_file sudo cp ../conf/nginx.conf $nginx_conf_file
sudo sed -i "s@PATHTOCHANGE@$path@g" $nginx_conf_file sudo sed -i "s@PATHTOCHANGE@$path@g" $nginx_conf_file

74
scripts/upgrade
View file

@ -6,56 +6,64 @@ app=rainloop
domain=$(sudo yunohost app setting $app domain) domain=$(sudo yunohost app setting $app domain)
path=$(sudo yunohost app setting $app path) path=$(sudo yunohost app setting $app path)
is_public=$(sudo yunohost app setting $app is_public) is_public=$(sudo yunohost app setting $app is_public)
dp_pwd=$(sudo yunohost app setting rainloop mysqlpwd) dp_pwd=$(sudo yunohost app setting $app mysqlpwd)
db_user=$app db_user=$app
# Initialize database and store mysql password for upgrade # no update for db now...
root_pwd=$(sudo cat /etc/yunohost/mysql) #root_pwd=$(sudo cat /etc/yunohost/mysql)
mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" #mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
sudo yunohost app initdb $db_user -p $db_pwd #sudo yunohost app initdb $db_user -p $db_pwd
# Copy files to the right place # Copy files to the right place
final_path=/var/www/$app final_path=/var/www/$app
rainloop_path=${final_path}/app rainloop_path=${final_path}/app
#rainloop_path=${final_path}
sudo rm -rf $final_path # no delete... we keep old install, the new is in a new path
sudo mkdir -p $final_path #sudo rm -rf $final_path
sudo mkdir -p $rainloop_path #sudo mkdir -p $final_path
#sudo mkdir -p $rainloop_path
# Use of latest community edition # Use of latest community edition
sudo wget http://repository.rainloop.net/v2/webmail/rainloop-community-latest.zip -O $rainloop_path/rainloop.zip sudo unzip ../sources/rainloop-community.zip -d $rainloop_path/
sudo unzip $rainloop_path/rainloop.zip -d $rainloop_path/
sudo rm $rainloop_path/rainloop.zip
# update patch to auto load version.
sudo cp ../sources/patch/index_auto_version.php $rainloop_path/index.php
# update ynh plugins:
sudo mkdir -p $rainloop_path/data/_data_/_default_/plugins
sudo cp -rf ../sources/plugins/ynh-login-mapping $rainloop_path/data/_data_/_default_/plugins/.
# Modify Nginx configuration file and copy it to Nginx conf directory # update SSO and auto version
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf if [ $final_path == $rainloop_path ]
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf then
sed -i "s@NAMETOCHANGE@$app@g" ../conf/nginx.conf # use modified version of master index.php that implement sso
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf sudo cp ../sources/sso/index.php $final_path/index.php
else
sed -i "s@NAMETOCHANGE@$app@g" ../conf/php-fpm.conf # use only sso on master
finalphpconf=/etc/php5/fpm/pool.d/$app.conf sudo cp ../sources/sso/sso.php $final_path/index.php
sudo cp ../conf/php-fpm.conf $finalphpconf sudo cp ../sources/patch/index_auto_version.php $rainloop_path/index.php
sudo chown root: $finalphpconf fi
sudo chmod 644 $finalphpconf sudo sed -i "s@domain.tld@$domain@g" $final_path/index.php
sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/index.php
# SSO
sed -i "s@domain.tld@$domain@g" ../conf/sso.php
sed -i "s@PATHTOCHANGE@$path@g" ../conf/sso.php
sudo cp ../conf/sso.php $final_path/index.php
# Set permissions to rainloop directory # Set permissions to rainloop directory
sudo chown -R www-data:www-data $final_path sudo chown -R www-data:www-data $final_path
# Make app public if necessary # Update Nginx configuration file
sudo yunohost app setting $app is_public -v "$is_public" nginx_conf_file=/etc/nginx/conf.d/$domain.d/$app.conf
if [ "$is_public" = "Yes" ]; sudo cp ../conf/nginx.conf $nginx_conf_file
then sudo sed -i "s@PATHTOCHANGE@$path@g" $nginx_conf_file
sudo yunohost app setting $app skipped_uris -v "/" sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" $nginx_conf_file
fi sudo sed -i "s@NAMETOCHANGE@$app@g" $nginx_conf_file
sudo chown root: $nginx_conf_file
sudo chmod 644 $nginx_conf_file
finalphpconf=/etc/php5/fpm/pool.d/$app.conf
sudo cp ../conf/php-fpm.conf $finalphpconf
sudo sed -i "s@NAMETOCHANGE@$app@g" $finalphpconf
sudo chown root: $finalphpconf
sudo chmod 644 $finalphpconf
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo service php5-fpm reload sudo service php5-fpm reload

18
sources/patch/index_auto_version.php Normal file
View file

@ -0,0 +1,18 @@
<?php
if (!defined('APP_VERSION')) {
$version = file_get_contents('/var/www/rainloop/app/data/VERSION');
if ($version) {
define('APP_VERSION', $version);
define('APP_INDEX_ROOT_FILE', __FILE__);
define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));
}
}
if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php')) {
include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php';
} else {
echo '[105] Missing version directory';
exit(105);
}
?>

5
sources/sso/index.php
View file

@ -1,10 +1,13 @@
<?php <?php
if (!defined('APP_VERSION')) { if (!defined('APP_VERSION')) {
define('APP_VERSION', '1.9.3.365'); $version = file_get_contents('data/VERSION');
if ($version) {
define('APP_VERSION', $version);
define('APP_INDEX_ROOT_FILE', __FILE__); define('APP_INDEX_ROOT_FILE', __FILE__);
define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/')); define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));
} }
}
if(isset($_GET["auto_log"])) { if(isset($_GET["auto_log"])) {
$_ENV['RAINLOOP_INCLUDE_AS_API'] = true; $_ENV['RAINLOOP_INCLUDE_AS_API'] = true;

0
conf/sso.php → sources/sso/sso.php
View file