diff --git a/conf/config.php b/conf/config.php index 8320ad6..a3b1f53 100644 --- a/conf/config.php +++ b/conf/config.php @@ -21,7 +21,7 @@ $_ENV['RAINLOOP_INCLUDE_AS_API'] = true; include $args['index']; $oConfig = \RainLoop\Api::Config(); -$oConfig->SetPassword($args['pwd']); +$oConfig->SetPassword($args['password']); echo $oConfig->Save() ? 'Admin password updated' : 'Admin password not updated'; ?> \ No newline at end of file diff --git a/scripts/install b/scripts/install index 34d4bd3..60a18a9 100644 --- a/scripts/install +++ b/scripts/install @@ -49,9 +49,7 @@ sudo mkdir -p $final_path sudo mkdir -p $rainloop_path # Use of latest community edition -sudo wget http://repository.rainloop.net/v2/webmail/rainloop-community-latest.zip -O $rainloop_path/rainloop.zip -sudo unzip $rainloop_path/rainloop.zip -d $rainloop_path/ -sudo rm $rainloop_path/rainloop.zip +sudo unzip ../sources/rainloop-community.zip -d $rainloop_path/ # Autoconfig sudo mkdir -p $rainloop_path/data/_data_/_default_/configs/ @@ -64,7 +62,7 @@ else fi sudo cp ../conf/data/configs/application.ini $application_file sudo sed -i "s@domain.tld@$domain@g" $application_file -sudo sed -i "s@MYSQLUSER@db_user@g" $application_file +sudo sed -i "s@MYSQLUSER@$db_user@g" $application_file sudo sed -i "s@MYSQLPASSWORD@$db_pwd@g" $application_file sudo sed -i "s@LANGTOCHANGE@$lang@g" $application_file @@ -73,8 +71,10 @@ sudo php ../conf/config.php --index="$rainloop_path/index.php" --password="$pass # Add default domain configs by looping through all the domains already added sudo mkdir -p $rainloop_path/data/_data_/_default_/domains/ -sudo yunohost domain list | sed -e '1d' | while read -r line ; do - domain=${line//- } + +# get list of ldap domaine +domains=`ldapsearch -LLL -x -b ou=domains,dc=yunohost,dc=org -s one "objectclass=top" virtualdomain | grep -v "dn:" | sed "s/virtualdomain://" ` +for domain in $domains ; do sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$domain.ini sudo sed -i "s@domain.tld@$domain@g" $rainloop_path/data/_data_/_default_/domains/$domain.ini done diff --git a/sources/rainloop-community.zip b/sources/rainloop-community.zip new file mode 100644 index 0000000..584c784 Binary files /dev/null and b/sources/rainloop-community.zip differ diff --git a/sources/sso/index.php b/sources/sso/index.php index 0a3ec86..0940498 100644 --- a/sources/sso/index.php +++ b/sources/sso/index.php @@ -1,7 +1,7 @@