From: Charles C. <ch...@ru...> - 2005-01-18 11:53:44
|
I would like the wiki file to specify the location of config.ini. This would allow me to use the clean versions of PhpWiki from CVS without a) having to remember to copy config.ini into the CVS controlled directory each time I get a fresh version (Eclipse deletes my private version of config.ini when I request a refresh from CVS b) when I get CVS-write access, I will not accidentally checkin my private version of config.ini with passwords I think that this facility might also be useful for wikifarms (but others will know better) Patch: index.php - line 36 - replace IniConfig(dirname(__FILE__)."/config/config.ini"); with if (defined('CONFIG_FILE_LOCATION')) { IniConfig(CONFIG_FILE_LOCATION); } else { IniConfig(dirname(__FILE__)."/config/config.ini"); } wiki - line 19 - insert The default location for config.ini is in phpwiki\config\config.ini To define an alternate location for config.ini, insert the following define before 'include "index.php";' and change the path to your required location define('CONFIG_FILE_LOCATION', 'C:\doc_root\config.ini'); If this change is accepted, will need to track down any other places in the code base that refer to config.ini (mostly it is documentation). regards, Charles |
From: Reini U. <ru...@x-...> - 2005-01-18 13:44:43
|
Charles Corrigan schrieb: > I would like the wiki file to specify the location of config.ini. This > would allow me to use the clean versions of PhpWiki from CVS without > a) having to remember to copy config.ini into the CVS controlled directory > each time I get a fresh version (Eclipse deletes my private version of > config.ini when I request a refresh from CVS config/config.ini is NOT in CVS. On purpose! > b) when I get CVS-write access, I will not accidentally checkin my private > version of config.ini with passwords So don't cvs add config/config.ini You can safely commit, cvs will touch only files which are in the CVS/Entries file. config/config.ini is not. -- Reini Urban http://xarch.tu-graz.ac.at/home/rurban/ |
From: Matthew P. <mp...@he...> - 2005-01-18 22:11:03
|
On Tue, Jan 18, 2005 at 07:53:41PM +0800, Charles Corrigan wrote: > a) having to remember to copy config.ini into the CVS controlled directory > each time I get a fresh version (Eclipse deletes my private version of > config.ini when I request a refresh from CVS Sounds like you need to teach eclipse not to be so brain-fuckingly stupid.= =20 That really is idiotic behaviour -- people keep all sorts of crap lying around in their CVS working copies. Blowing it all away every time you run update would get real old, real fast. > b) when I get CVS-write access, I will not accidentally checkin my private > version of config.ini with passwords So don't cvs add config/config.ini. That's a fairly long and specific string of random characters for your cat to produce while walking on your keyboard. - Matt |
From: Arnaud F. <ar...@cr...> - 2005-01-19 09:50:16
|
Heu ..... Why don't you add a .cvsignore file in co,fig/ directory ? Just put config.ini in it, and cvs will ignore this file ... RTFM ;) Le 18 janv. 05, =E0 23:08, Matthew Palmer a =E9crit : > On Tue, Jan 18, 2005 at 07:53:41PM +0800, Charles Corrigan wrote: >> a) having to remember to copy config.ini into the CVS controlled=20 >> directory >> each time I get a fresh version (Eclipse deletes my private version = of >> config.ini when I request a refresh from CVS > > Sounds like you need to teach eclipse not to be so brain-fuckingly=20 > stupid. > That really is idiotic behaviour -- people keep all sorts of crap = lying > around in their CVS working copies. Blowing it all away every time=20 > you run > update would get real old, real fast. > >> b) when I get CVS-write access, I will not accidentally checkin my=20 >> private >> version of config.ini with passwords > > So don't cvs add config/config.ini. That's a fairly long and specific > string of random characters for your cat to produce while walking on=20= > your > keyboard. > > - Matt > -- Arnaud Fontaine CRAO Jabber: sh...@ra... |