Fixes #29 Add support for iwatch

to automatically index Changes with solr and include Crypt::OpenSSL::Verify to replace Crypt::OpenSSL::VerifyX509
iwatch
Timothy Legge 2020-05-21 10:03:28 -03:00
parent c52b4d0fa9
commit 379c9bf9f9
3 changed files with 23 additions and 1 deletions

View File

@ -44,7 +44,8 @@ RUN sed -n 's/main/testing/p' /etc/apk/repositories >> /etc/apk/repositories &&
perl-xml-canonicalizexml perl-xml-easy perl-xml-generator perl-xml-parser \
perl-xml-tidy perl-xml-writer perl-xml-xpath perl-yaml perl-yaml-tiny \
perl-file-mmagic perl-net-saml2 imagemagick-perlmagick graphviz \
odt2txt antiword lynx poppler-utils perl-email-address-xs --update-cache && \
odt2txt antiword lynx poppler-utils perl-email-address-xs \
perl-crypt-openssl-verify iwatch --update-cache && \
# perl-libapreq2 -- Apache2::Request - Here for completeness but we use nginx \
rm -fr /var/cache/apk/APKINDEX.*
@ -131,14 +132,20 @@ RUN cd /var/www/foswiki && \
tools/extension_installer WebFontsContrib -r -enable install && \
tools/extension_installer WorkflowPlugin -r -enable install && \
tools/extension_installer XSendFileContrib -r -enable install && \
tools/configure -save -set {Plugins}{AutoViewTemplatePlugin}{Enabled}='0' && \
tools/configure -save -set {Plugins}{LdapNgPlugin}{Enabled}='0' && \
tools/configure -save -set {Plugins}{SamlLoginContrib}{Enabled}='0' && \
rm -fr /var/www/foswiki/working/configure/download/* && \
rm -fr /var/www/foswiki/working/configure/backup/*
RUN mkdir -p /run/nginx && \
mkdir -p /etc/nginx/conf.d
RUN chown -R nginx:nginx /var/www/foswiki
COPY nginx.default.conf /etc/nginx/conf.d/default.conf
COPY docker-entrypoint.sh docker-entrypoint.sh
COPY iwatch.xml /etc/iwatch.xml
EXPOSE 80

View File

@ -17,6 +17,9 @@ sed -i '/SolrPlugin..Url/s/localhost/solr/' /var/www/foswiki/lib/LocalSite.cfg
echo "...enabling NatSkin"
grep -q "Set SKIN = nat" /var/www/foswiki/data/Main/SitePreferences.txt || sed -i '/---++ Appearance/a\ \ \ * Set SKIN = nat' /var/www/foswiki/data/Main/SitePreferences.txt
echo "...starting iwatch"
iwatch -d
echo "...starting nginx+foswiki"
cd /var/www/foswiki/bin

12
iwatch.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" ?>
<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
<config>
<guard email="root@localhost" name="IWatch"/>
<watchlist>
<title>Foswiki</title>
<contactpoint email="root@localhost" name="Administrator"/>
<path type="recursive" filter=".*\.txt$" alert="off" syslog="on" exec="su -s /bin/sh nginx -c '/var/www/foswiki/tools/solrjob'">/var/www/foswiki/data</path>
<path type="regexception">\.tmp|\.sw\w|\.svn|\.lease|\.lock|,$|\.changes|,v|^_[0-9]|^log|^Temporary|^UnitTestCheck</path>
</watchlist>
</config>