Merge pull request #77 from YunoHost-Apps/enh_redis_locking

Enable Redis file locking

conf/config.json

@@ -1,38 +1,46 @@
-{
-  "system": {
-    "datadirectory": "#DATADIR#",
-    "trusted_domains": [
-      "localhost",
-      "#DOMAIN#"
-    ],
-    "updatechecker": false,
-    "memcache.local": "\\OC\\Memcache\\APCu",
-    "integrity.check.disabled": true
-  },
-  "apps": {
-    "user_ldap": {
-      "ldap_base": "dc=yunohost,dc=org",
-      "ldap_base_groups": "ou=groups,dc=yunohost,dc=org",
-      "ldap_base_users": "ou=users,dc=yunohost,dc=org",
-      "ldap_cache_ttl": "600",
-      "ldap_configuration_active": "1",
-      "ldap_display_name": "displayname",
-      "ldap_email_attr": "mail",
-      "ldap_expert_username_attr": "uid",
-      "ldap_group_display_name": "cn",
-      "ldap_group_filter": "objectClass=posixGroup",
-      "ldap_group_filter_mode": "0",
-      "ldap_groupfilter_objectclass": "posixGroup",
-      "ldap_host": "localhost",
-      "ldap_login_filter": "(&(|(objectclass=posixAccount))(uid=%uid))",
-      "ldap_login_filter_mode": "0",
-      "ldap_port": "389",
-      "ldap_quota_attr": "userquota",
-      "ldap_tls": "0",
-      "ldap_user_display_name": "cn",
-      "ldap_user_filter_mode": "0",
-      "ldap_userfilter_objectclass": "posixAccount",
-      "ldap_userlist_filter": "objectclass=posixAccount"
-    }
-  }
-}
+{
+  "system": {
+    "datadirectory": "#DATADIR#",
+    "trusted_domains": [
+      "localhost",
+      "#DOMAIN#"
+    ],
+    "updatechecker": false,
+    "memcache.local": "\\OC\\Memcache\\APCu",
+    "integrity.check.disabled": true,
+    "filelocking.enabled": true,
+    "memcache.locking": "\\OC\\Memcache\\Redis",
+    "redis": {
+      "host": "localhost",
+      "port": "6379",
+      "timeout": "0.0",
+      "password": ""
+     }
+  },
+  "apps": {
+    "user_ldap": {
+      "ldap_base": "dc=yunohost,dc=org",
+      "ldap_base_groups": "ou=groups,dc=yunohost,dc=org",
+      "ldap_base_users": "ou=users,dc=yunohost,dc=org",
+      "ldap_cache_ttl": "600",
+      "ldap_configuration_active": "1",
+      "ldap_display_name": "displayname",
+      "ldap_email_attr": "mail",
+      "ldap_expert_username_attr": "uid",
+      "ldap_group_display_name": "cn",
+      "ldap_group_filter": "objectClass=posixGroup",
+      "ldap_group_filter_mode": "0",
+      "ldap_groupfilter_objectclass": "posixGroup",
+      "ldap_host": "localhost",
+      "ldap_login_filter": "(&(|(objectclass=posixAccount))(uid=%uid))",
+      "ldap_login_filter_mode": "0",
+      "ldap_port": "389",
+      "ldap_quota_attr": "userquota",
+      "ldap_tls": "0",
+      "ldap_user_display_name": "cn",
+      "ldap_user_filter_mode": "0",
+      "ldap_userfilter_objectclass": "posixAccount",
+      "ldap_userlist_filter": "objectclass=posixAccount"
+    }
+  }
+}

conf/nginx.conf

@@ -23,7 +23,12 @@ location ^~ __PATH__ {
   # Set max upload size
   client_max_body_size 10G;
   fastcgi_buffers 64 4K;
-
+  
+  # Extend timeouts
+  client_body_timeout 60m;
+  proxy_read_timeout 60m;
+  fastcgi_read_timeout 60m;
+  
   # Disable gzip to avoid the removal of the ETag header
   gzip off;
 

scripts/_common.sh

@@ -3,7 +3,7 @@
 # COMMON VARIABLES
 #=================================================
 
-pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick acl tar smbclient"
+pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-redis php5-imagick imagemagick acl tar smbclient"
 
 #=================================================
 # COMMON HELPERS