[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2106-g46fe47e

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Aug 14 12:47:28 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  46fe47ec8a3c1321f88bf3efdba045e750351557 (commit)
      from  92278badc6e089bc9bd2e00aafff1b6fa0c128fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=46fe47ec8a3c1321f88bf3efdba045e750351557

commit 46fe47ec8a3c1321f88bf3efdba045e750351557
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Aug 14 10:47:18 2017 +0000

    enable phptextcaptcha in docker

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b9543ae..add8133 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,6 +21,8 @@ RUN source ./autoinstall/common-backports && \
                    php-process \
                    php-mbstring \
                    php-pear-HTTP \
+                   php-pear-Text_CAPTCHA \
+                   php-markdown \
                    httpd \
                    mod_dav_svn \
                    mod_ssl \
@@ -43,7 +45,8 @@ RUN source ./autoinstall/common-backports && \
                    cronie \
                    mediawiki \
                    vsftpd \
-                   mercurial && \
+                   mercurial \
+                   dejavu-fonts-common && \
     yum -y clean all
 
 RUN yum --enablerepo=epel install -y supervisor \
diff --git a/docker/postinstall.sh b/docker/postinstall.sh
index 957566b..10bfba7 100644
--- a/docker/postinstall.sh
+++ b/docker/postinstall.sh
@@ -6,6 +6,6 @@ done
 echo 'PostgreSQL started.'
 /usr/local/share/fusionforge/post-install.d/db/db.sh configure
 cd /opt/sources/fusionforge/src
-for pluginname in blocks compactpreview gravatar headermenu mediawiki message moinmoin repositoryapi scmgit scmhook scmsvn scmhg taskboard webanalytics; do
+for pluginname in blocks compactpreview gravatar headermenu mediawiki message moinmoin phptextcaptcha repositoryapi scmgit scmhook scmsvn scmhg taskboard webanalytics; do
     make post-install-plugin-${pluginname}
 done
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 23057b7..041fae8 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -56,7 +56,8 @@ make install-base \
      install-plugin-headermenu \
      install-plugin-gravatar \
      install-plugin-scmhook \
-     install-plugin-webanalytics
+     install-plugin-webanalytics \
+     install-plugin-phptextcaptcha
 }
 __postinstall() {
 /usr/local/share/fusionforge/post-install.d/common/common.sh configure
@@ -68,6 +69,8 @@ __postinstall() {
 __zzzzlocalini() {
 echo '[core]' > /etc/fusionforge/config.ini.d/zzzz-local.ini
 echo 'is_docker = 1' >> /etc/fusionforge/config.ini.d/zzzz-local.ini
+echo "tracker_parser_type = 'markdown'" >> /etc/fusionforge/config.ini.d/zzzz-local.ini
+
 if [[ ! -z ${PORT_HTTP} ]]; then
    echo 'http_port = '${PORT_HTTP} >> /etc/fusionforge/config.ini.d/zzzz-local.ini
 fi
@@ -77,6 +80,10 @@ fi
 if [[ ! -z ${PORT_SSH} ]]; then
    echo 'ssh_port = '${PORT_SSH} >> /etc/fusionforge/config.ini.d/zzzz-local.ini
 fi
+
+echo '[blocks]' >> /etc/fusionforge/config.ini.d/zzzz-local.ini
+echo "parser_type = 'markdown'" >> /etc/fusionforge/config.ini.d/zzzz-local.ini
+echo "default = 'use markdown syntax to format your text'" >> /etc/fusionforge/config.ini.d/zzzz-local.ini
 }
 
 __etchost() {

-----------------------------------------------------------------------

Summary of changes:
 docker/Dockerfile     | 5 ++++-
 docker/postinstall.sh | 2 +-
 docker/startpoint.sh  | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list