[TASK] Reword migration to Jirafeau 4.0.0

[jirafeau_project.git] / lib / config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index 6a5c1babada2672941538f0177b034b8023e60fb..30440a2c6c158b04b1537f98aa5c68e3feb93679 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -24,7 +24,6 @@
  * To overwrite these settings copy the file,
  * rename it to »config.local.php« and adapt the parameters.
  **/
  * To overwrite these settings copy the file,
  * rename it to »config.local.php« and adapt the parameters.
  **/

-global $cfg;

 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */
 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */


@@ -44,6 +43,18 @@ $cfg['lang'] = 'auto';
  */
 $cfg['style'] = 'courgette';
 
  */
 $cfg['style'] = 'courgette';
 

+/* Name the organisation running this installation, eg. 'ACME'
+ */
+$cfg['organisation'] = 'ACME';
+
+/* Provide a contact person for this installation, eg. 'John Doe <doe@example.com>'
+ */
+$cfg['contactperson'] = '';
+
+/* Give the installation a title, eg. 'Datahub' or 'John Doe Filehost'
+ */
+$cfg['title'] = '';
+

 /* Propose a preview link if file type is previewable
  */
 $cfg['preview'] = true;
 /* Propose a preview link if file type is previewable
  */
 $cfg['preview'] = true;


@@ -73,6 +84,14 @@ $cfg['upload_password'] = array();
  */
 $cfg['upload_ip'] = array();
 
  */
 $cfg['upload_ip'] = array();
 

+/* List of IP allowed to upload a file without password.
+ * If the list is empty, then there is no upload restriction based on IP.
+ * Elements of the list can be a single IP (e.g. "123.45.67.89") or
+ * an IP range (e.g. "123.45.0.0/16").
+ * Note that CIDR notation is available for IPv4 only for the moment.
+ */
+$cfg['upload_ip_nopassword'] = array();
+

 /* Password for the admin interface.
  * An empty password will disable the password authentification.
  * The password is a sha256 hash of the original version.
 /* Password for the admin interface.
  * An empty password will disable the password authentification.
  * The password is a sha256 hash of the original version.


@@ -98,7 +117,7 @@ $cfg['admin_http_auth_user'] = '';
  * 'year': file available for one year
  * 'none': unlimited availability
  */
  * 'year': file available for one year
  * 'none': unlimited availability
  */

-$cfg['availabilities'] = array (
+$cfg['availabilities'] = array(

     'minute' => true,
     'hour' => true,
     'day' => true,
     'minute' => true,
     'hour' => true,
     'day' => true,


@@ -132,12 +151,3 @@ $cfg['proxy_ip'] = array();
  * or needs to start the installation script
  */
 $cfg['installation_done'] = false;
  * or needs to start the installation script
  */
 $cfg['installation_done'] = false;

-
-/* Try to include user's local configuration. */
-if ((basename (__FILE__) != 'config.local.php')
-    && file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
-{
-    require (JIRAFEAU_ROOT.'lib/config.local.php');
-}
-
-?>