Merge branch 'yuno_test'

README.md

@@ -6,8 +6,8 @@
 
 Current snapshot in *sources*:
 
-* https://github.com/redmatrix/hubzilla: 2.4.1 (commit 46e079beea8eb4cbcdd938681c702ef7481a3337)
-* https://github.com/redmatrix/hubzilla-addons: 2.4.1 (commit 30f3104ebe2121a433d174bb3bcb703bb9787bd3)
+* https://github.com/redmatrix/hubzilla: 2.4.2 (commit 8896ebf7cbf20c242399c3821be5881e6068175a)
+* https://github.com/redmatrix/hubzilla-addons: 2.4.2 (commit 30f3104ebe2121a433d174bb3bcb703bb9787bd3)
 
 ## Important Notes
 

conf/ldap_conf.php

@@ -0,0 +1,7 @@
+App::$config['system']['addon'] = 'ldapauth';
+
+App::$config['ldapauth']['ldap_server'] = 'localhost';
+App::$config['ldapauth']['ldap_searchdn'] = 'ou=users,dc=yunohost,dc=org';
+App::$config['ldapauth']['ldap_userattr'] = 'uid';
+App::$config['ldapauth']['ldap_autocreateaccount_emailattribute'] = 'mail';
+App::$config['ldapauth']['create_account'] = '1';

scripts/install

@@ -85,7 +85,9 @@ sudo sed -i "s/mysqlusername/$db_user/g" $final_path/.htconfig.php
 sudo sed -i "s/mysqldatabasename/$db_user/g" $final_path/.htconfig.php
 sudo sed -i "s/mysite.example/$domain/g" $final_path/.htconfig.php
 sudo sed -i "s/if the auto install failed, put a unique random string here/$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)/g" $final_path/.htconfig.php
-sudo sed -i "s/ADMIN_EMAIL_REPLACE/$email/g" $final_path/.htconfig.php
+sudo sed -i "s/\['admin_email'\] = '';/\['admin_email'\] = '$email';/g" $final_path/.htconfig.php
+# addon ldap config
+sudo su -c "cat ../conf/ldap_conf.php >> $final_path/.htconfig.php"
 
 # Set www-data to owner
 sudo chown -R www-data:www-data $final_path

scripts/upgrade

@@ -34,6 +34,7 @@ sudo md5sum -c ../sources/hubzilla/source_md5 --status || (echo "Corrupt source"
 sudo unzip -q ${hubzilla_file}.zip -d ../sources/hubzilla/
 sudo cp -r ../sources/hubzilla/${hubzilla_file}/. $final_path
 sudo cp -a ${final_path}.old/store ${final_path}
+sudo cp -a ${final_path}.old/.htconfig.php ${final_path}
 sudo rm -Rf ${final_path}.old
 
 # 2 - Addons
@@ -45,20 +46,9 @@ sudo mkdir $final_path/addon
 sudo cp -r ../sources/hubzilla-addons/${addons_file}/. $final_path/addon
 
 # 3 - some extra folders
-sudo mkdir -p "${final_path}/store/[data]/smarty3"
 sudo chmod -R 777 $final_path/store
 
-# Copy the template install/htconfig.sample.php to .htconfig.php
-sudo cp $final_path/install/htconfig.sample.php $final_path/.htconfig.php
 
-# Use sed to add the database information to .htconfig.php
-sudo sed -i "s/your.mysqlhost.com/localhost/g" $final_path/.htconfig.php
-sudo sed -i "s/mysqlpassword/$db_pwd/g" $final_path/.htconfig.php
-sudo sed -i "s/mysqlusername/$db_user/g" $final_path/.htconfig.php
-sudo sed -i "s/mysqldatabasename/$db_user/g" $final_path/.htconfig.php
-sudo sed -i "s/mysite.example/$domain/g" $final_path/.htconfig.php
-sudo sed -i "s/if the auto install failed, put a unique random string here/$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)/g" $final_path/.htconfig.php
-sudo sed -i "s/ADMIN_EMAIL_REPLACE/$email/g" $final_path/.htconfig.php
 
 # Set www-data to owner
 sudo chown -R www-data:www-data $final_path

sources/hubzilla-addons/source_file

@@ -1 +1 @@
-hubzilla-addons-2.4.1
+hubzilla-addons-2.4.2

sources/hubzilla-addons/source_md5

@@ -1 +1 @@
-aff46da933e40b125c21946ec48220c5  hubzilla-addons-2.4.1.zip
+24cde04ec71c61864e0ce904a27ad432  hubzilla-addons-2.4.2.zip

sources/hubzilla-addons/source_url

@@ -1 +1 @@
-https://github.com/redmatrix/hubzilla-addons/archive/2.4.1.zip
+https://github.com/redmatrix/hubzilla-addons/archive/2.4.2.zip

sources/hubzilla/source_file

@@ -1 +1 @@
-hubzilla-2.4.1
+hubzilla-2.4.2

sources/hubzilla/source_md5

@@ -1 +1 @@
-8c824159e5464d9d5cf312a41e50327c  hubzilla-2.4.1.zip
+779d29162c3e7635bc1c93707c3da67f  hubzilla-2.4.2.zip

sources/hubzilla/source_url

@@ -1 +1 @@
-https://github.com/redmatrix/hubzilla/archive/2.4.1.zip
+https://github.com/redmatrix/hubzilla/archive/2.4.2.zip