On Sun, 19 Apr 2015 16:19:23 +0100 Bertrand Jacquin <[email protected]> said:
> The main point here is to track the config file changes. I understand > the fact that you want to use the config wui, but there is no chance > anyone cloning the tree today can get the exact same website as we have > on www.enlightenment.org, because you do not have any config about what > theme to use, the showfooter, date and all the specific we are using > today. Any change made in the wui can be reported to the git tree with > no real painful work. Today the config file is file system agnostic, and > we can easily make it domain-name agnostic. that is actually incorrect. datadir and mediadir are conflicts to a local.php - every time you have added it into git i have to edit a new one and deal with "unstaged commits" to it or a local commit i have to back out before a commit to the template etc. the web config ui as a result of this being in git is also broken as it will forever make local changes that won't be committed back and thus will break the ability to update the www (especially for template) without then also manually committing and pushing the local.php changes too - which you can't do from the server www repo (you have to go copy the files by hand back to your personal repo and commit, push, git reset the server one etc.) we can put a "workable" local.php.e-sample in git for peolpe to duplicate to their own to run a dokuwiki instance locally. they will need to deal with az different www-content location, different git author name, etc. etc. setups for content commit-back with gitbacked and i also set a different local cachetime soi can see keyword add results for code links far faster on a local instance. a local dokuwiki instance > I'm trying to find a way to get a default conf/users.auth.php that will > not be update to git, so someone can clone on it's own machine and get > the default admin password from the README, and actually have the exact > same look as www.enlightenment.org with no wizardry figuring out what > could be the parameters on www.enlightenment.org just keep the install.php - it will be triggered on a missing users.auth.php and will prompt for permission problems and then a new admin accont. thats why the install.php should be kept. > This can goes as long for conf/acl.auth.php, and generally maybe all the > files in conf/ subdir. > > A README file is necessary for anyone who wants to have a local clone of > the website, as today nothing explain how to have it, what URL to clone > to get the www-content etc .. (that can be made using git submodule, but > i'm not really kin of it). It probably works for you as you made that > config, but not for anyone else i'm afraid. i also hate submodules. :) > On 17/04/2015 01:44, Carsten Haitzler wrote: > > 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'; > >> > >> -- > >> > >> > > -- > Bertrand > -- ------------- 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
