On Thu, 16 Apr 2015 16:43:34 -0700 Bertrand Jacquin <[email protected]> said:
beber - NO. dokuwiki EDITS this page. there is nothing to commit it backto git when the php edits it. you are just going to get to the point where the www git is unable to be updated due to local changes" all day long. i removed it for a VERY GOOD REASON. i run a local dokuwiki and i have to have a different local.php config as a result for example and not this also ends up overwriting/conflicting you just can't put this in git - just like you can't put the user auth file either. > beber pushed a commit to branch master. > > http://git.enlightenment.org/website/www.git/commit/?id=140dbb6435d1525386cbc0ccc6d39717ba2879c9 > > commit 140dbb6435d1525386cbc0ccc6d39717ba2879c9 > Author: Bertrand Jacquin <[email protected]> > Date: Fri Apr 17 00:42:13 2015 +0100 > > MINOR: Import conf/local.php as we want to essence of that repo is to > keep track of patches and config > --- > public_html/conf/local.php | 57 +++++++++++++++++++++++++++++++++++++++++++++ > + 1 file changed, 57 insertions(+) > > diff --git a/public_html/conf/local.php b/public_html/conf/local.php > new file mode 100644 > index 0000000..ba813d6 > --- /dev/null > +++ b/public_html/conf/local.php > @@ -0,0 +1,57 @@ > +<?php > +/* > + * Dokuwiki's Main Configuration File - Local Settings > + */ > + > +$conf['title'] = ''; > +$conf['template'] = 'e'; > +$conf['license'] = '0'; > +$conf['recent'] = 0; > +$conf['recent_days'] = 0; > +$conf['breadcrumbs'] = 0; > +$conf['dformat'] = ''; > +$conf['tocminheads'] = '20'; > +$conf['maxtoclevel'] = '0'; > +$conf['maxseclevel'] = '0'; > +$conf['useheading'] = '1'; > +$conf['useacl'] = 1; > +$conf['passcrypt'] = 'sha512'; > +$conf['superuser'] = '@admin'; > +$conf['disableactions'] = 'recent,revisions'; > +$conf['jpg_quality'] = 90; > +$conf['subscribers'] = 1; > +$conf['mailfrom'] = '[email protected]'; > +$conf['mailprefix'] = 'Enlightenment'; > +$conf['sitemap'] = 1; > +$conf['updatecheck'] = 0; > +$conf['userewrite'] = '1'; > +$conf['useslash'] = 1; > +$conf['compress'] = 0; > +$conf['send404'] = 1; > +$conf['compression'] = '0'; > +$conf['plugin']['include']['showfooter'] = 0; > +$conf['plugin']['include']['showdate'] = 0; > +$conf['plugin']['include']['showuser'] = 0; > +$conf['plugin']['include']['showcomments'] = 0; > +$conf['plugin']['include']['showlinkbacks'] = 0; > +$conf['plugin']['include']['showtags'] = 0; > +$conf['plugin']['include']['showeditbtn'] = 0; > +$conf['plugin']['include']['doredirect'] = 0; > +$conf['plugin']['include']['doindent'] = 0; > +$conf['plugin']['include']['parlink'] = 0; > +$conf['plugin']['include']['safeindex'] = 0; > +$conf['plugin']['include']['readmore'] = 0; > +$conf['plugin']['captcha']['mode'] = 'audio'; > +$conf['plugin']['captcha']['width'] = 300; > +$conf['plugin']['captcha']['height'] = 100; > +$conf['plugin']['discussion']['allowguests'] = 0; > +$conf['plugin']['discussion']['urlfield'] = 1; > +$conf['plugin']['discussion']['moderatorgroups'] = 'admin,edit'; > +$conf['plugin']['gitbacked']['pushAfterCommit'] = 1; > +$conf['plugin']['gitbacked']['periodicPull'] = 1; > +$conf['plugin']['gitbacked']['periodicMinutes'] = 1; > +$conf['plugin']['gitbacked']['repoPath'] = 'data/www-content'; > +$conf['plugin']['gitbacked']['repoWorkDir'] = 'data/www-content/tmp'; > +$conf['tpl']['dokui']['hide-entry-title'] = '1'; > +$conf['datadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/pages'; > +$conf['mediadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/media'; > > -- > > -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) [email protected] ------------------------------------------------------------------------------ BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT Develop your own process in accordance with the BPMN 2 standard Learn Process modeling best practices with Bonita BPM through live exercises http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_ source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
