diff --git a/app/controllers/auth.php b/app/controllers/auth.php index c3f600e8ca..21e4217326 100644 --- a/app/controllers/auth.php +++ b/app/controllers/auth.php @@ -135,7 +135,7 @@ $utopia->post('/v1/auth/register') ->setParam('{{redirect}}', $redirect) ; - $mail = $register->get('smtp'); /* @var $mail \MailgunLite\MailgunLite */ + $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */ $mail->addAddress($email, $name); @@ -275,7 +275,7 @@ $utopia->post('/v1/auth/register/confirm/resend') ->setParam('{{redirect}}', $redirect) ; - $mail = $register->get('smtp'); /* @var $mail \MailgunLite\MailgunLite */ + $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */ $mail->addAddress($user->getAttribute('email'), $user->getAttribute('name')); @@ -507,7 +507,7 @@ $utopia->post('/v1/auth/recovery') ->setParam('{{redirect}}', $redirect) ; - $mail = $register->get('smtp'); /* @var $mail \MailgunLite\MailgunLite */ + $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */ $mail->addAddress($profile->getAttribute('email', ''), $profile->getAttribute('name', '')); diff --git a/app/controllers/teams.php b/app/controllers/teams.php index 94a977865c..92d6b451d9 100644 --- a/app/controllers/teams.php +++ b/app/controllers/teams.php @@ -371,7 +371,7 @@ $utopia->post('/v1/teams/:teamId/memberships') ->setParam('{{redirect}}', $redirect) ; - $mail = $register->get('smtp'); /* @var $mail \MailgunLite\MailgunLite */ + $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */ $mail->addAddress($email, $name); @@ -452,7 +452,7 @@ $utopia->post('/v1/teams/:teamId/memberships/:inviteId/resend') ->setParam('{{redirect}}', $redirect) ; - $mail = $register->get('smtp'); /* @var $mail \MailgunLite\MailgunLite */ + $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */ $mail->addAddress($invitee->getAttribute('email'), $invitee->getAttribute('name')); diff --git a/composer.json b/composer.json index b098e0d912..a255cdca89 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,6 @@ "chrisboulton/php-resque-scheduler": "*", "geoip2/geoip2": "2.9.0", "piwik/device-detector": "3.5.1", - "eldadfux/mailgun-lite": "master", "dragonmantank/cron-expression": "2.2.0", "domnikl/statsd": "2.0.*", "influxdb/influxdb-php": "1.15.*", diff --git a/composer.lock b/composer.lock index 70dcf80c1d..22966290c6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a46675ad60074c2cd9da1bb5b7c65047", + "content-hash": "6c5fcf274285960f2b3ab96bb9ce16ba", "packages": [ { "name": "appwrite/php-clamav", @@ -284,12 +284,12 @@ "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5" + "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/f26a67e397be0e5c00d7c52ec7b5010098e15ce5", - "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527", + "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", "shasum": "" }, "require": { @@ -332,7 +332,7 @@ "ssl", "tls" ], - "time": "2019-08-02 09:05:43" + "time": "2019-08-30 08:44:50" }, { "name": "dasprid/enum", @@ -472,54 +472,6 @@ ], "time": "2018-06-06T03:12:17+00:00" }, - { - "name": "eldadfux/mailgun-lite", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/eldadfux/mailgun-php-lite.git", - "reference": "0f99bb55306dd5e9f1a6785e6a0a17cd56f06118" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/eldadfux/mailgun-php-lite/zipball/0f99bb55306dd5e9f1a6785e6a0a17cd56f06118", - "reference": "0f99bb55306dd5e9f1a6785e6a0a17cd56f06118", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "php": ">=7.0.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.35" - }, - "type": "project", - "autoload": { - "psr-4": { - "MailgunLite\\": "src/MailgunLite" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eldad Fux", - "homepage": "https://twitter.com/eldadfux" - } - ], - "description": "A lite and minimalistic PHP client library for sending mails using Mailgun API.", - "homepage": "https://github.com/eldadfux/mailgun-php-lite", - "keywords": [ - "Simple", - "api", - "lite", - "mailgun" - ], - "time": "2018-12-31 08:25:18" - }, { "name": "erusev/parsedown", "version": "1.7.1", @@ -1251,12 +1203,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4", + "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4", "shasum": "" }, "require": { @@ -1293,7 +1245,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2019-08-29 13:16:46" }, { "name": "psr/log", @@ -2040,18 +1992,18 @@ "authors": [ { "name": "Arne Blankerts", - "role": "Developer", - "email": "arne@blankerts.de" + "email": "arne@blankerts.de", + "role": "Developer" }, { "name": "Sebastian Heuer", - "role": "Developer", - "email": "sebastian@phpeople.de" + "email": "sebastian@phpeople.de", + "role": "Developer" }, { "name": "Sebastian Bergmann", - "role": "Developer", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "Developer" } ], "description": "Library for handling version information and constraints", diff --git a/docker-stack.yml b/docker-stack.yml deleted file mode 100644 index 3a121a3874..0000000000 --- a/docker-stack.yml +++ /dev/null @@ -1,144 +0,0 @@ -version: '3' - -services: - loadbalancer: - image: traefik:alpine - command: |- - --entryPoints="Name:http Address::80 Redirect.EntryPoint:https" - --entryPoints="Name:https Address::443 TLS" - --defaultentrypoints="http,https" - --defaultentrypoints="http" - --accesslogsfile="/var/log/access.log" - --acme - --acme.acmelogging="true" - --acme.email="example@example.com" - --acme.entrypoint="https" - --acme.storage="/acme/acme.json" - --acme.onhostrule="true" - --docker - --docker.swarmmode - --docker.domain="dev.appwrite.io" - --docker.watch - --web - ports: - - 80:80 - - 443:443 - networks: - - appwrite - - influxdb - - redis - volumes: - - traefik_acme:/acme/ - - traefik_logs:/var/log/access.log - - /var/run/docker.sock:/var/run/docker.sock - deploy: - placement: - constraints: - - node.role == manager - labels: - traefik.enable: 'true' - traefik.frontend.rule: 'Host:lb.dev.appwrite.io' - #traefik.frontend.auth.basic: 'eldad:$$2y$$05$$PyArpB89r9PybmRMmOXBG.mJkUNE9Jyw7iONtghDGX8IsR/XSMINO' # Use this command to generate password: echo $(htpasswd -nbB user "password") | sed -e s/\\$/\\$\\$/g - traefik.port: 8080 - - appwrite: - build: . - restart: unless-stopped - networks: - - appwrite - - mariadb - - clamav - - redis - - influxdb - volumes: - - .:/usr/share/nginx/html - - ./docker/app/nginx.conf:/etc/nginx/nginx.conf:rw - - ./storage:/storage:rw - environment: - - _APP_ENV=development - - _APP_REDIS_HOST=redis - - _APP_REDIS_PORT=6379 - - _APP_DB_HOST=mariadb - - _APP_DB_PORT=3306 - - _APP_DB_SCHEMA=data-3 - - _APP_OPENSSL_KEY_V1= - - _APP_DB_USER=root - - _APP_DB_PASS= - - _APP_NEWRELIC_KEY= - - _APP_MAILGUN_KEY= - - _APP_MAILGUN_DOMAIN= - - _APP_PAYPAL_CLIENT_ID= - - _APP_PAYPAL_CLIENT_KEY= - - _APP_SENTRY_DSN= - deploy: - mode: replicated - replicas: 2 - labels: - traefik.enable: 'true' - traefik.frontend.rule: 'Host: dev.appwrite.io' - traefik.port: 80 - traefik.docker.network: 'appwrite' - traefik.frontend.auth.forward.tls.insecureSkipVerify: 'true' - - mariadb: - image: mariadb:10.4 # fix issues when upgrading using: mysql_upgrade -u root -p - restart: unless-stopped - environment: - MYSQL_ROOT_PASSWORD: - networks: - - mariadb - volumes: - - ./storage/db:/var/lib/mysql:rw - - redis: - image: redis:5.0 - restart: unless-stopped - networks: - - redis - - clamav: - image: appwrite/clamav:v1.0.2 - restart: unless-stopped - networks: - - clamav - volumes: - - ./storage:/storage:rw - deploy: - mode: replicated - replicas: 2 - - influxdb: - image: influxdb:1.6 - networks: - - influxdb - volumes: - - ./storage/influxdb:/var/lib/influxdb - - kapacitor: - image: kapacitor:1.5 - environment: - - KAPACITOR_HOSTNAME=kapacitor - - KAPACITOR_INFLUXDB_0_URLS_0=http://influxdb:8086 - networks: - - influxdb - - telegraf-statsd: - image: registry.gitlab.com/appwrite/appwrite/telegraf-statsd - networks: - - influxdb - -volumes: - traefik_acme: - traefik_logs: - -networks: - appwrite: - driver: overlay - mariadb: - driver: overlay - clamav: - driver: overlay - redis: - driver: overlay - influxdb: - driver: overlay \ No newline at end of file