beber pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=5603eedd29ffdca336389fabc8a12bcc543149bb
commit 5603eedd29ffdca336389fabc8a12bcc543149bb
Author: Bertrand Jacquin <bertr...@jacquin.bzh>
Date: Tue Apr 14 01:55:07 2015 +0100
MEDIUM: conf: Store local.php on git.
Move plugins/gitbacked non default config to conf/local.php
---
.gitignore | 1 -
public_html/conf/local.php | 76 ++++++++++++++++++++++
public_html/lib/plugins/gitbacked/conf/default.php | 19 ------
3 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 31ae363..e20bf13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
# Dokuwiki
-public_html/conf/local.php
public_html/conf/local.php.bak
public_html/conf/users.auth.php
public_html/data/attic
diff --git a/public_html/conf/local.php b/public_html/conf/local.php
new file mode 100644
index 0000000..9ba1d35
--- /dev/null
+++ b/public_html/conf/local.php
@@ -0,0 +1,76 @@
+<?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'] = 'no-re...@enlightenment.org';
+$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';
+
+/* plugin/gitbacked: Define a nice author (until addParams is fixed) */
+$_git_auhor_name = 'www.enlightenment.org';
+$_git_auhor_mail = 'no-re...@enlightenment.org';
+
+if (isset($GLOBALS['USERINFO']['name'])) {
+ $_git_auhor_name = $GLOBALS['USERINFO']['name'];
+}
+
+if (isset($GLOBALS['USERINFO']['mail'])) {
+ $_git_auhor_mail = $GLOBALS['USERINFO']['mail'];
+}
+
+putenv("GIT_AUTHOR_NAME='$_git_auhor_name'");
+putenv("GIT_AUTHOR_EMAIL='$_git_auhor_mail'");
+
+/* plugin/gitbacked: Let access to ssh-agent */
+putenv("HOME=" . dirname($_SERVER['DOCUMENT_ROOT']));
+putenv("SSH_AUTH_SOCK=" . dirname($_SERVER['DOCUMENT_ROOT']) . "/.ssh/agent");
diff --git a/public_html/lib/plugins/gitbacked/conf/default.php
b/public_html/lib/plugins/gitbacked/conf/default.php
index dbaf11c..c3baffc 100644
--- a/public_html/lib/plugins/gitbacked/conf/default.php
+++ b/public_html/lib/plugins/gitbacked/conf/default.php
@@ -15,22 +15,3 @@ $conf['commitMediaMsgDel'] = 'Wiki media %media% deleted by
%user%';
$conf['repoPath'] = $GLOBALS['conf']['savedir'];
$conf['repoWorkDir'] = $GLOBALS['conf']['savedir'];
$conf['addParams'] = '';
-
-/* Define a nice author (until addParams is fixed) */
-$_git_auhor_name = 'www.enlightenment.org';
-$_git_auhor_mail = 'no-re...@enlightenment.org';
-
-if (isset($GLOBALS['USERINFO']['name'])) {
- $_git_auhor_name = $GLOBALS['USERINFO']['name'];
-}
-
-if (isset($GLOBALS['USERINFO']['mail'])) {
- $_git_auhor_mail = $GLOBALS['USERINFO']['mail'];
-}
-
-putenv("GIT_AUTHOR_NAME='$_git_auhor_name'");
-putenv("GIT_AUTHOR_EMAIL='$_git_auhor_mail'");
-
-/* Env for git+ssh */
-putenv("HOME=" . dirname($_SERVER['DOCUMENT_ROOT']));
-putenv("SSH_AUTH_SOCK=" . dirname($_SERVER['DOCUMENT_ROOT']) . "/.ssh/agent");
--
