Merge remote-tracking branch 'origin/master'

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

diff --git a/lib/config.original.php b/lib/config.original.php
index 755b762aea1912f2d97507c3a74016f7a764f0f2..8f55113c244fd293623d6d008cad1cff98bd710e 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -15,15 +15,15 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License

- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  */
  */

- 
+

 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;
 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;

- 
+

 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';
 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';


@@ -89,6 +89,13 @@ $cfg['availabilities'] = array ('minute' => true,
  * 0 mean unlimited upload size.
  */
 $cfg['maximal_upload_size'] = 0;
  * 0 mean unlimited upload size.
  */
 $cfg['maximal_upload_size'] = 0;

+/* If your Jirafeau is behind some reverse proxies, you can set there IPs
+ * so Jirafeau get visitor's IP from HTTP_X_FORWARDED_FOR instead of
+ * REMOTE_ADDR.
+ * for example:
+ * $cfg['proxy_ip'] = array('12.34.56.78');
+ */
+$cfg['proxy_ip'] = array();

 /* Installation is done ? */
 $cfg['installation_done'] = false;
 
 /* Installation is done ? */
 $cfg['installation_done'] = false;