From: Christian Weiske Date: Mon, 30 Sep 2013 19:04:17 +0000 (+0200) Subject: move config.php to config.php.dist, ignore user config X-Git-Tag: 0.8.0~6^2~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af6040dce7b6dd4c903148c5e7d7825b3899febf;p=contagged move config.php to config.php.dist, ignore user config --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7b9019d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +inc/config.php diff --git a/inc/config.php b/inc/config.php deleted file mode 100644 index 03741d4..0000000 --- a/inc/config.php +++ /dev/null @@ -1,71 +0,0 @@ - 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RT2yXp_ZAY8_ufC3CFXhHIE1NvwkxSoniRWQPYZHIWuWPbij8hFqvrEuw', - 'intranet.cosmo' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RTxyuybgLnXtMVD7dljhze3zUboVhTqk9yc-rQVvv2YwFFJN20RCNbIVA', - 'intranet' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RTjlGRJ-JcA4ENdYSxSTUELqnaldxSOyZdbUNylw_BZHH1bBLrQNGtjZg', - 'fileserver.cosmo' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RQ2oMD1p7-NjsUZiDyjvzpK3IuhixTXdHGQRp8jtjwAl-P4oPPEB_hGgw', - ); - - // Force recompilation of smarty templates? - $conf['smartycompile'] = 0; - - diff --git a/inc/config.php.dist b/inc/config.php.dist new file mode 100644 index 0000000..03741d4 --- /dev/null +++ b/inc/config.php.dist @@ -0,0 +1,71 @@ + 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RT2yXp_ZAY8_ufC3CFXhHIE1NvwkxSoniRWQPYZHIWuWPbij8hFqvrEuw', + 'intranet.cosmo' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RTxyuybgLnXtMVD7dljhze3zUboVhTqk9yc-rQVvv2YwFFJN20RCNbIVA', + 'intranet' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RTjlGRJ-JcA4ENdYSxSTUELqnaldxSOyZdbUNylw_BZHH1bBLrQNGtjZg', + 'fileserver.cosmo' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RQ2oMD1p7-NjsUZiDyjvzpK3IuhixTXdHGQRp8jtjwAl-P4oPPEB_hGgw', + ); + + // Force recompilation of smarty templates? + $conf['smartycompile'] = 0; + +