Skip to content

Commit d63b445

Browse files
authored
fix: ZMSA-1: scope package, update deps (#89)
* scope package, update deps * use updated deps
1 parent 9aed0d5 commit d63b445

6 files changed

Lines changed: 1556 additions & 1173 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WORKDIR /app
77
RUN git clone -b v3.0.5 https://github.com/haraka/Haraka.git ./
88
RUN npm install --production
99

10-
RUN npm install haraka-plugin-wildduck
10+
RUN npm install @zone-eu/haraka-plugin-wildduck
1111

1212
FROM node:lts-alpine as app
1313

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This plugin:
1010

1111
```sh
1212
cd /path/to/local/haraka
13-
npm install haraka-plugin-wildduck
13+
npm install @zone-eu/haraka-plugin-wildduck
1414
echo "wildduck" >> config/plugins
1515
service haraka restart
1616
```
@@ -22,7 +22,7 @@ WildDuck plugin should be placed last in the plugins file.
2222
This plugin expects MongoDB settings to be set. By default, it uses unauthenticated localhost. If you need to use more specific settings then create your own configuration file:
2323

2424
```sh
25-
cp node_modules/haraka-plugin-wildduck/config/wildduck.ini config/wildduck.ini
25+
cp node_modules/@zone-eu/haraka-plugin-wildduck/config/wildduck.ini config/wildduck.ini
2626
$EDITOR config/wildduck.ini
2727
```
2828

@@ -38,4 +38,4 @@ This plugin includes SPF and DKIM support. You should not enable Haraka's built-
3838

3939
European Union Public License 1.1 ([details](http://ec.europa.eu/idabc/eupl.html)) or later
4040

41-
> WildDuck plugin for Haraka (`haraka-plugin-wildduck`) is part of the Zone Mail Suite (ZMS). Suite of programs and modules for an efficient, fast and modern email server.
41+
> WildDuck plugin for Haraka (`@zone-eu/haraka-plugin-wildduck`) is part of the Zone Mail Suite (ZMS). Suite of programs and modules for an efficient, fast and modern email server.

index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ const dns = require('dns');
1010
const ObjectId = require('mongodb').ObjectId;
1111
const punycode = require('punycode.js');
1212
const SRS = require('srs.js');
13-
const counters = require('wildduck/lib/counters');
14-
const tools = require('wildduck/lib/tools');
13+
const counters = require('@zone-eu/wildduck/lib/counters');
14+
const tools = require('@zone-eu/wildduck/lib/tools');
1515
const StreamCollect = require('./lib/stream-collect');
16-
const Maildropper = require('wildduck/lib/maildropper');
17-
const FilterHandler = require('wildduck/lib/filter-handler');
18-
const BimiHandler = require('wildduck/lib/bimi-handler');
19-
const autoreply = require('wildduck/lib/autoreply');
20-
const wdErrors = require('wildduck/lib/errors');
16+
const Maildropper = require('@zone-eu/wildduck/lib/maildropper');
17+
const FilterHandler = require('@zone-eu/wildduck/lib/filter-handler');
18+
const BimiHandler = require('@zone-eu/wildduck/lib/bimi-handler');
19+
const autoreply = require('@zone-eu/wildduck/lib/autoreply');
20+
const wdErrors = require('@zone-eu/wildduck/lib/errors');
2121
const Gelf = require('gelf');
2222
const addressparser = require('nodemailer/lib/addressparser');
2323
const libmime = require('libmime');
2424
const { promisify } = require('util');
25-
const plugins = require('wildduck/lib/plugins');
25+
const plugins = require('@zone-eu/wildduck/lib/plugins');
2626

2727
const { mail: hookMail, dataPost: hookDataPost } = require('./lib/hooks');
2828

lib/db.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
const mongodb = require('mongodb');
44
const Redis = require('ioredis');
55
const MongoClient = mongodb.MongoClient;
6-
const UserHandler = require('wildduck/lib/user-handler');
7-
const MessageHandler = require('wildduck/lib/message-handler');
8-
const { SettingsHandler } = require('wildduck/lib/settings-handler');
9-
const counters = require('wildduck/lib/counters');
10-
const tools = require('wildduck/lib/tools');
6+
const UserHandler = require('@zone-eu/wildduck/lib/user-handler');
7+
const MessageHandler = require('@zone-eu/wildduck/lib/message-handler');
8+
const { SettingsHandler } = require('@zone-eu/wildduck/lib/settings-handler');
9+
const counters = require('@zone-eu/wildduck/lib/counters');
10+
const tools = require('@zone-eu/wildduck/lib/tools');
1111

1212
const getDBConnection = (main, config, callback) => {
1313
if (main) {

0 commit comments

Comments
 (0)