[SOGo] Remove thunderbird plugin generation, will move to docs
andryyy
parent
fa8b5c3ab1
commit
2fadfee61a
|
|
@ -1,4 +1,4 @@
|
|||
FROM debian:jessie-slim
|
||||
FROM debian:stretch-slim
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
|
@ -11,30 +11,23 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
ca-certificates \
|
||||
cron \
|
||||
gnupg \
|
||||
make \
|
||||
mysql-client \
|
||||
supervisor \
|
||||
syslog-ng \
|
||||
syslog-ng-core \
|
||||
syslog-ng-mod-redis \
|
||||
tar \
|
||||
dirmngr \
|
||||
wget \
|
||||
zip \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
|
||||
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
|
||||
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||
&& chmod +x /usr/local/bin/gosu \
|
||||
&& gosu nobody true
|
||||
|
||||
RUN mkdir /usr/share/doc/sogo \
|
||||
&& touch /usr/share/doc/sogo/empty.sh \
|
||||
&& apt-key adv --keyserver keys.gnupg.net --recv-key 0x810273C4 \
|
||||
&& echo "deb http://packages.inverse.ca/SOGo/nightly/3/debian/ jessie jessie" > /etc/apt/sources.list.d/sogo.list \
|
||||
&& apt-key adv --keyserver sks.labs.nic.cz --recv-key A04BE668 \
|
||||
&& echo "deb http://www.axis.cz/linux/debian stretch sogo-v3" > /etc/apt/sources.list.d/sogo.list \
|
||||
&& apt-get update && apt-get install -y --force-yes \
|
||||
sogo \
|
||||
sogo-activesync \
|
||||
|
|
|
|||
|
|
@ -93,9 +93,6 @@ echo ' </dict>
|
|||
chown sogo:sogo -R /var/lib/sogo/
|
||||
chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
|
||||
|
||||
# Regenerate the SOGo Integrator plugin
|
||||
/thunderbird/build-plugins.sh ${MAILCOW_HOSTNAME} < <(mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain FROM domain;" -B -N)
|
||||
|
||||
supervisorctl restart sogo
|
||||
|
||||
sleep 99999
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ destination d_combined {
|
|||
destination d_redis_persistent_log {
|
||||
redis(
|
||||
host("redis-mailcow")
|
||||
persist-name("redis1")
|
||||
port(6379)
|
||||
command("LPUSH" "SOGO_LOG" "$(format-json time=\"$S_UNIXTIME\" priority=\"$PRIORITY\" program=\"$PROGRAM\" message=\"$MESSAGE\")\n")
|
||||
);
|
||||
|
|
@ -29,6 +30,7 @@ destination d_redis_persistent_log {
|
|||
destination d_redis_f2b_channel {
|
||||
redis(
|
||||
host("redis-mailcow")
|
||||
persist-name("redis2")
|
||||
port(6379)
|
||||
command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
<?php
|
||||
/* updates.php - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2006-2014 Inverse inc.
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* This script handles the automatic propagation of extensions pertaining to a
|
||||
SOGo site. It requires PHP 4.1.0 or later. */
|
||||
$plugin_dir = 'thunderbird-plugins';
|
||||
chdir($plugin_dir);
|
||||
$plugins = array();
|
||||
|
||||
if (file_exists('version.csv'))
|
||||
{
|
||||
$fh = fopen('version.csv', 'r');
|
||||
if ($fh)
|
||||
{
|
||||
while (($row = fgetcsv($fh, 1000, ';')) !== FALSE)
|
||||
{
|
||||
$plugins[$row[0]] = array(
|
||||
'application' => 'thunderbird',
|
||||
'version' => $row[1],
|
||||
'filename' => str_replace('__DOMAIN__', $_GET["domain"], $row[2]),
|
||||
);
|
||||
}
|
||||
fclose($fh);
|
||||
}
|
||||
}
|
||||
|
||||
$applications
|
||||
= array( "thunderbird" => "<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
|
||||
<em:minVersion>31.0</em:minVersion>
|
||||
<em:maxVersion>31.*</em:maxVersion>" );
|
||||
|
||||
$pluginname = $_GET["plugin"];
|
||||
$plugin =& $plugins[$pluginname];
|
||||
$application =& $applications[$plugin["application"]];
|
||||
|
||||
if ( $plugin ) {
|
||||
$platform = $_GET["platform"];
|
||||
if ( $platform
|
||||
&& file_exists( $platform . "/" . $plugin["filename"] ) ) {
|
||||
$plugin["filename"] = $platform . "/" . $plugin["filename"];
|
||||
}
|
||||
elseif ( !file_exists( $plugin["filename"] ) ) {
|
||||
$plugin = false;
|
||||
}
|
||||
}
|
||||
|
||||
if ( $plugin ) {
|
||||
header("Content-type: text/xml; charset=utf-8");
|
||||
echo ('<?xml version="1.0"?>' . "\n");
|
||||
?>
|
||||
<!DOCTYPE RDF>
|
||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
||||
<Description about="urn:mozilla:extension:<?php echo $pluginname ?>">
|
||||
<em:updates>
|
||||
<Seq>
|
||||
<li>
|
||||
<Description>
|
||||
<em:version><?php echo $plugin["version"] ?></em:version>
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
<?php echo $applications[$plugin["application"]] ?>
|
||||
|
||||
<em:updateLink><?php echo 'https://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . '/' . $plugin_dir . '/' . $plugin["filename"] ?></em:updateLink>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
</Description>
|
||||
</li>
|
||||
</Seq>
|
||||
</em:updates>
|
||||
</Description>
|
||||
</RDF>
|
||||
<?php
|
||||
} else {
|
||||
header("Content-type: text/plain; charset=utf-8", true, 404);
|
||||
echo( 'Plugin not found' );
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
*.zip
|
||||
sogo-*-master
|
||||
version.csv
|
||||
*.xpi
|
||||
*.tar.gz
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
MAILHOST=$1
|
||||
|
||||
cd $(dirname $0)
|
||||
|
||||
wget -O integrator.tar.gz https://github.com/inverse-inc/sogo-integrator.tb31/archive/master.tar.gz
|
||||
wget -O connector.tar.gz https://github.com/inverse-inc/sogo-connector.tb31/archive/master.tar.gz
|
||||
|
||||
mkdir -p integrator connector
|
||||
tar --strip-components=1 -C integrator -xf integrator.tar.gz
|
||||
tar --strip-components=1 -C connector -xf connector.tar.gz
|
||||
|
||||
# build custom integrator
|
||||
while read DOMAIN; do
|
||||
echo "Building SOGo Integrator for $DOMAIN hosted on $MAILHOST"
|
||||
cd integrator
|
||||
echo > defaults/preferences/site.js
|
||||
mkdir -p custom/${DOMAIN}
|
||||
cp -r custom/sogo-demo/* custom/${DOMAIN}/
|
||||
sed -i "s/http:\/\/sogo-demo\.inverse\.ca/https:\/\/${MAILHOST}/g" custom/${DOMAIN}/chrome/content/extensions.rdf
|
||||
sed -i "s/plugins\/updates\.php[?]/thunderbird-plugins.php?domain=${DOMAIN}\&/g" custom/${DOMAIN}/chrome/content/extensions.rdf
|
||||
echo 'pref("sogo-integrator.autocomplete.server.urlid", "'${DOMAIN}'");' > custom/${DOMAIN}/defaults/preferences/site.js
|
||||
echo 'pref("mail.collect_email_address_outgoing", false);' >> custom/${DOMAIN}/defaults/preferences/site.js
|
||||
sed -i 's/<\/Seq>/<li><Description em:id="sieve@mozdev.org" em:name="Sieve"\/><\/li><li><Description em:id="imap-acl@sirphreak.com" em:name="Imap-ACL-Extension"\/><\/li><\/Seq>/g' custom/${DOMAIN}/chrome/content/extensions.rdf
|
||||
make build=${DOMAIN}
|
||||
INTEGRATOR_VER=$(grep em:version install.rdf | awk -F '"' '{print $2}')
|
||||
cp sogo-integrator-*-${DOMAIN}.xpi ../sogo-integrator-${INTEGRATOR_VER}-${DOMAIN}.xpi
|
||||
cd ..
|
||||
done
|
||||
|
||||
# build connector
|
||||
cd connector
|
||||
make
|
||||
CONNECTOR_VER=$(grep em:version install.rdf | awk -F '"' '{print $2}')
|
||||
cp sogo-connector-*.xpi ../sogo-connector-${CONNECTOR_VER}.xpi
|
||||
cd ..
|
||||
|
||||
# download Sieve plugin
|
||||
SIEVE_RELEASES=$(wget --header="Accept: application/vnd.github.v3+json" -qO - https://api.github.com/repos/thsmi/sieve/releases)
|
||||
SIEVE_VER=$(echo "$SIEVE_RELEASES" | grep -o '"tag_name": *"[^"]*"' | head -n 1 | awk -F '"' '{print $4}')
|
||||
SIEVE_URL=$(echo "$SIEVE_RELEASES" | grep -o '"browser_download_url": *"[^"]*"' | head -n 1 | awk -F '"' '{print $4}')
|
||||
wget -O sieve-${SIEVE_VER}.xpi ${SIEVE_URL}
|
||||
unset SIEVE_RELEASES
|
||||
|
||||
# download ACL plugin
|
||||
IMAP_ACL_RELEASES=$(wget -qO - 'https://addons.mozilla.org/api/v3/addons/addon/176736')
|
||||
IMAP_ACL_VER=$(echo "$IMAP_ACL_RELEASES" | grep -o '"version": *"[^"]*"' | head -n 1 | awk -F '"' '{print $4}')
|
||||
IMAP_ACL_URL=$(echo "$IMAP_ACL_RELEASES" | grep -o '"url": *"[^"]*\.xpi' | head -n 1 | awk -F '"' '{print $4}')
|
||||
wget -O imap_acl_extension-${IMAP_ACL_VER}-tb.xpi ${IMAP_ACL_URL}
|
||||
unset IMAP_ACL_RELEASES
|
||||
|
||||
# update version file
|
||||
echo "sogo-connector@inverse.ca;${CONNECTOR_VER};sogo-connector-${CONNECTOR_VER}.xpi" > version.csv
|
||||
echo "sogo-integrator@inverse.ca;${INTEGRATOR_VER};sogo-integrator-${INTEGRATOR_VER}-__DOMAIN__.xpi" >> version.csv
|
||||
echo "sieve@mozdev.org;${SIEVE_VER};sieve-${SIEVE_VER}.xpi" >> version.csv
|
||||
echo "imap-acl@sirphreak.com;${IMAP_ACL_VER};imap_acl_extension-${IMAP_ACL_VER}-tb.xpi" >> version.csv
|
||||
|
||||
rm -rf connector integrator *.tar.gz
|
||||
|
|
@ -158,7 +158,6 @@ services:
|
|||
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
||||
volumes:
|
||||
- ./data/conf/sogo/:/etc/sogo/
|
||||
- ./data/web/thunderbird-plugins:/thunderbird
|
||||
restart: always
|
||||
logging:
|
||||
options:
|
||||
|
|
|
|||
Loading…
Reference in New Issue