From 3d3e22253c3f29012ef12c71f5b029a61f8908a7 Mon Sep 17 00:00:00 2001
From: anmol26s <5068843+anmol26s@users.noreply.github.com>
Date: Wed, 10 Oct 2018 02:57:11 +0530
Subject: [PATCH] Updated sources checksum 2018.09 (#14)

* Updated to version 2018.09 (#11)

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Upgrade to 2018.09

* Fixed ldap plugin in 2018.09

* Removed name from ldap configuration

* Updation from previous version fix

* Updation from previous version fix

* Updation from previous version fix

* Put commenting at right palce

* Remove ini file for php

* Updated the sources for 2018.09

* Fixed php.conf error
---
 README.md         |  4 ++--
 conf/addons.src   |  4 ++--
 conf/app.src      |  4 ++--
 conf/php-fpm.conf | 12 ++++++++++++
 conf/php-fpm.ini  | 11 -----------
 scripts/backup    |  1 -
 scripts/restore   |  1 -
 7 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 conf/php-fpm.ini

diff --git a/README.md b/README.md
index d1e2636..5c95c50 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@
 
 Current snapshot in *sources*:
 
-* https://github.com/friendica/friendica: 2018.05 (commit 2a760bb770c015703567caa91054bcb3c9422fc0)
-* https://github.com/friendica/friendica-addons: 2018.05 (commit 97108080c26ab7b98b30e4b6c61f057314b44577)
+* https://github.com/friendica/friendica: 2018.09 (commit c48fcd4a8f329946cdf09d214596ecf29e859cff)
+* https://github.com/friendica/friendica-addons: 2018.09 (commit 9c275a4185956fb2ca790263fb72f6da6311742f)
 
 ## Important Notes
 
diff --git a/conf/addons.src b/conf/addons.src
index baced9e..75ded5f 100644
--- a/conf/addons.src
+++ b/conf/addons.src
@@ -1,6 +1,6 @@
 SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2018.09.zip
-SOURCE_SUM=9a9e4702419e369ffc7ecfd8fb5b5f97
-SOURCE_SUM_PRG=md5sum
+SOURCE_SUM=4862f5d8fb46375ea0232ab3bf6c012153371e51d6d1505bc25a696a7aefc82a 
+SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
diff --git a/conf/app.src b/conf/app.src
index 5c1a65f..c922317 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
 SOURCE_URL=https://github.com/friendica/friendica/archive/2018.09.zip
-SOURCE_SUM=f127463d2c6c1c593b1f1ae5ea80dcf3
-SOURCE_SUM_PRG=md5sum
+SOURCE_SUM=02407b87da8d645faaa88429970617231d71bb7611ebe2770f5cca5c54e60e2e
+SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 8affbc2..57affa6 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -390,3 +390,15 @@ catch_workers_output = yes
 ;php_admin_value[error_log] = /var/log/fpm-php.www.log
 ;php_admin_flag[log_errors] = on
 ;php_admin_value[memory_limit] = 32M
+
+; Common values to change to increase file upload limit
+; upload_max_filesize = 50M
+; post_max_size = 50M
+; mail.add_x_header = Off
+
+; Other common parameters
+; max_execution_time = 600
+; max_input_time = 300
+; memory_limit = 256M
+; short_open_tag = On
+
diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
deleted file mode 100644
index bf0f5e0..0000000
--- a/conf/php-fpm.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-; Common values to change to increase file upload limit
-; upload_max_filesize = 50M
-; post_max_size = 50M
-; mail.add_x_header = Off
-
-; Other common parameters
-; max_execution_time = 600
-; max_input_time = 300
-; memory_limit = 256M
-; short_open_tag = On
-register_argc_argv=1;
diff --git a/scripts/backup b/scripts/backup
index 1a3a9b4..392665c 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -49,7 +49,6 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 
 ynh_backup "/etc/php5/fpm/pool.d/$app.conf"
-ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
diff --git a/scripts/restore b/scripts/restore
index 5995bdf..cd74c85 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -72,7 +72,6 @@ ynh_system_user_create $app
 #=================================================
 
 ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
-ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
 
 #=================================================
 # SPECIFIC RESTORATION