From 725ecc75a6901d9cb2d0e6b72d2ea5f24151ad59 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 14 Sep 2018 11:24:04 +0200 Subject: [PATCH] Move "postfix" host to "host" --- README.md | 1 - basic/srv/vm/mgr/confupdater.py | 4 ++-- ckan/setup/srv/ckan/conf/ckan.ini | 2 +- .../setup/srv/crisiscleanup/conf/environments/production.rb | 2 +- gnuhealth/setup/srv/gnuhealth/conf/trytond.conf | 2 +- kanboard/setup/srv/kanboard/conf/config.php | 2 +- mifosx/setup/adminpwd.sql | 2 +- .../motech-email.properties | 2 +- pandora/setup/srv/pandora/conf/local_settings.py | 2 +- sahana-demo/setup/srv/sahana-demo/conf/000_config.py | 2 +- sahana/setup/srv/sahana/conf/000_config.py | 2 +- sambro/setup/srv/sambro/conf/000_config.py | 2 +- seeddms/setup/srv/seeddms/conf/settings.xml | 2 +- sigmah/setup/srv/sigmah/conf/sigmah.properties | 2 +- ushahidi/setup/adminpwd.sql | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3d34891..0deefe4 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,6 @@ vi 00-install.sh | ODK Build | opendatakit-build | 8017 | 8080 (HTTP) | odkbuild | | OpenMapKit | openmapkit | 8007 | 8080 (HTTP) | omk | | Pan.do/ra | pandora | 8002 | 8080 (HTTP) | pandora | -| Postfix | postfix | 587 | 25 (SMTP) | - | | Postgres | postgres | 5432 | 5432 (Postgres) | - | | RabbitMQ | rabbitmq | 5672 | 5672 (AMQP) | - | | Redis | redis | 6379 | 6379 (Redis) | - | diff --git a/basic/srv/vm/mgr/confupdater.py b/basic/srv/vm/mgr/confupdater.py index 207d302..7f98787 100644 --- a/basic/srv/vm/mgr/confupdater.py +++ b/basic/srv/vm/mgr/confupdater.py @@ -98,14 +98,14 @@ def update_email(email): replace_file_line('/srv/sambro/conf/000_config.py', 'settings.mail.approver = ', '"{}"'.format(email)) # SeedDMS if app_exists('seeddms'): - replace_file_line('/srv/seeddms/conf/settings.xml', ' '.format(email)) + replace_file_line('/srv/seeddms/conf/settings.xml', ' '.format(email)) # Sigmah if app_exists('sigmah'): replace_file_line('/srv/sigmah/conf/sigmah.properties', 'mail.from.address=', email) replace_file_line('/srv/sigmah/conf/sigmah.properties', 'mail.support.to=', email) # Ushahidi if app_exists('ushahidi'): - email_json = '{{\\"incoming_type\\":\\"IMAP\\",\\"incoming_server\\":\\"localhost\\",\\"incoming_port\\":143,\\"incoming_security\\":\\"None\\",\\"incoming_username\\":\\"{}\\",\\"incoming_password\\":\\"password\\",\\"outgoing_type\\":\\"SMTP\\",\\"outgoing_server\\":\\"postfix\\",\\"outgoing_port\\":25,\\"outgoing_security\\":\\"None\\",\\"outgoing_username\\":\\"{}\\",\\"outgoing_password\\":\\"password\\",\\"from\\":\\"{}\\",\\"from_name\\":\\"Ushahidi\\"}}'.format(email, email, email) + email_json = '{{\\"incoming_type\\":\\"IMAP\\",\\"incoming_server\\":\\"localhost\\",\\"incoming_port\\":143,\\"incoming_security\\":\\"None\\",\\"incoming_username\\":\\"{}\\",\\"incoming_password\\":\\"password\\",\\"outgoing_type\\":\\"SMTP\\",\\"outgoing_server\\":\\"host\\",\\"outgoing_port\\":25,\\"outgoing_security\\":\\"None\\",\\"outgoing_username\\":\\"{}\\",\\"outgoing_password\\":\\"password\\",\\"from\\":\\"{}\\",\\"from_name\\":\\"Ushahidi\\"}}'.format(email, email, email) query = 'UPDATE `config` SET `config_value` = "{}" WHERE `group_name` LIKE "data-provider" AND `config_key` LIKE "email";'.format(email_json) run_mysql_query(query, 'ushahidi') query = 'UPDATE `config` SET `config_value` = "\\"{}\\"" WHERE `group_name` LIKE "site" AND `config_key` LIKE "email";'.format(email) diff --git a/ckan/setup/srv/ckan/conf/ckan.ini b/ckan/setup/srv/ckan/conf/ckan.ini index a95b4eb..632b539 100644 --- a/ckan/setup/srv/ckan/conf/ckan.ini +++ b/ckan/setup/srv/ckan/conf/ckan.ini @@ -199,7 +199,7 @@ ckan.hide_activity_from_users = %(ckan.site_id)s #email_to = errors@example.com #error_email_from = ckan-errors@example.com -smtp.server = postfix +smtp.server = host smtp.starttls = False #smtp.user = username@example.com #smtp.password = your_password diff --git a/crisiscleanup/setup/srv/crisiscleanup/conf/environments/production.rb b/crisiscleanup/setup/srv/crisiscleanup/conf/environments/production.rb index 907f55e..1226a96 100644 --- a/crisiscleanup/setup/srv/crisiscleanup/conf/environments/production.rb +++ b/crisiscleanup/setup/srv/crisiscleanup/conf/environments/production.rb @@ -16,7 +16,7 @@ Rails.application.configure do config.consider_all_requests_local = false config.action_controller.perform_caching = true ActionMailer::Base.smtp_settings = { - :address => 'postfix' + :address => 'host' } config.action_mailer.default_url_options = { :host => 'www.crisiscleanup.org', diff --git a/gnuhealth/setup/srv/gnuhealth/conf/trytond.conf b/gnuhealth/setup/srv/gnuhealth/conf/trytond.conf index 5aacc99..83353b0 100644 --- a/gnuhealth/setup/srv/gnuhealth/conf/trytond.conf +++ b/gnuhealth/setup/srv/gnuhealth/conf/trytond.conf @@ -12,4 +12,4 @@ ssl_webdav = False [email] from = admin@example.com -uri = smtp://postfix:25 +uri = smtp://host:25 diff --git a/kanboard/setup/srv/kanboard/conf/config.php b/kanboard/setup/srv/kanboard/conf/config.php index b3ae7e7..290c835 100644 --- a/kanboard/setup/srv/kanboard/conf/config.php +++ b/kanboard/setup/srv/kanboard/conf/config.php @@ -44,7 +44,7 @@ define('MAIL_FROM', 'admin@example.com'); define('MAIL_TRANSPORT', 'smtp'); // SMTP configuration to use when the "smtp" transport is chosen -define('MAIL_SMTP_HOSTNAME', 'postfix'); +define('MAIL_SMTP_HOSTNAME', 'host'); define('MAIL_SMTP_PORT', 25); define('MAIL_SMTP_USERNAME', ''); define('MAIL_SMTP_PASSWORD', ''); diff --git a/mifosx/setup/adminpwd.sql b/mifosx/setup/adminpwd.sql index 0de25ed..1a0e3b3 100644 --- a/mifosx/setup/adminpwd.sql +++ b/mifosx/setup/adminpwd.sql @@ -2,5 +2,5 @@ UPDATE `m_appuser` SET `username` = "${MIFOSX_ADMIN_USER}", `password` = "${MIFO UPDATE `c_external_service_properties` SET `value` = "admin@example.com" WHERE `external_service_id` = 2 and `name` LIKE "username"; UPDATE `c_external_service_properties` SET `value` = "" WHERE `external_service_id` = 2 and `name` LIKE "password"; -UPDATE `c_external_service_properties` SET `value` = "postfix" WHERE `external_service_id` = 2 and `name` LIKE "host"; +UPDATE `c_external_service_properties` SET `value` = "host" WHERE `external_service_id` = 2 and `name` LIKE "host"; UPDATE `c_external_service_properties` SET `value` = "false" WHERE `external_service_id` = 2 and `name` LIKE "useTLS"; diff --git a/motech/setup/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties b/motech/setup/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties index f35a122..1fcae66 100644 --- a/motech/setup/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties +++ b/motech/setup/srv/motech/conf/config/org.motechproject.motech-platform-email/motech-email.properties @@ -1,2 +1,2 @@ -mail.host=postfix +mail.host=host mail.port=25 diff --git a/pandora/setup/srv/pandora/conf/local_settings.py b/pandora/setup/srv/pandora/conf/local_settings.py index 0e3648e..80b511b 100644 --- a/pandora/setup/srv/pandora/conf/local_settings.py +++ b/pandora/setup/srv/pandora/conf/local_settings.py @@ -11,7 +11,7 @@ DB_GIN_TRGM = True BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@rabbitmq:5672//pandora' -EMAIL_HOST = 'postfix' +EMAIL_HOST = 'host' XACCELREDIRECT = True diff --git a/sahana-demo/setup/srv/sahana-demo/conf/000_config.py b/sahana-demo/setup/srv/sahana-demo/conf/000_config.py index 18f2cb8..e9ed49f 100644 --- a/sahana-demo/setup/srv/sahana-demo/conf/000_config.py +++ b/sahana-demo/setup/srv/sahana-demo/conf/000_config.py @@ -92,7 +92,7 @@ settings.auth.hmac_key = "${SAHANADEMO_HMAC}" # Email settings # Outbound server -settings.mail.server = "postfix:25" +settings.mail.server = "host:25" #settings.mail.tls = True # Useful for Windows Laptops: # https://www.google.com/settings/security/lesssecureapps diff --git a/sahana/setup/srv/sahana/conf/000_config.py b/sahana/setup/srv/sahana/conf/000_config.py index b086ecb..4dfc77e 100644 --- a/sahana/setup/srv/sahana/conf/000_config.py +++ b/sahana/setup/srv/sahana/conf/000_config.py @@ -92,7 +92,7 @@ settings.auth.hmac_key = "${SAHANA_HMAC}" # Email settings # Outbound server -settings.mail.server = "postfix:25" +settings.mail.server = "host:25" #settings.mail.tls = True # Useful for Windows Laptops: # https://www.google.com/settings/security/lesssecureapps diff --git a/sambro/setup/srv/sambro/conf/000_config.py b/sambro/setup/srv/sambro/conf/000_config.py index 19cc2d8..45b65aa 100644 --- a/sambro/setup/srv/sambro/conf/000_config.py +++ b/sambro/setup/srv/sambro/conf/000_config.py @@ -92,7 +92,7 @@ settings.auth.hmac_key = "${SAMBRO_HMAC}" # Email settings # Outbound server -settings.mail.server = "postfix:25" +settings.mail.server = "host:25" #settings.mail.tls = True # Useful for Windows Laptops: # https://www.google.com/settings/security/lesssecureapps diff --git a/seeddms/setup/srv/seeddms/conf/settings.xml b/seeddms/setup/srv/seeddms/conf/settings.xml index 70b31ca..7b57afc 100644 --- a/seeddms/setup/srv/seeddms/conf/settings.xml +++ b/seeddms/setup/srv/seeddms/conf/settings.xml @@ -14,7 +14,7 @@ - + diff --git a/sigmah/setup/srv/sigmah/conf/sigmah.properties b/sigmah/setup/srv/sigmah/conf/sigmah.properties index 5b84af7..14ea4ce 100644 --- a/sigmah/setup/srv/sigmah/conf/sigmah.properties +++ b/sigmah/setup/srv/sigmah/conf/sigmah.properties @@ -22,7 +22,7 @@ files.upload.maxSize=20971520 # MAILS # -- -mail.hostname=postfix +mail.hostname=host mail.port=25 mail.from.address=admin@example.com mail.from.name=Sigmah diff --git a/ushahidi/setup/adminpwd.sql b/ushahidi/setup/adminpwd.sql index 04e6145..3d10f6c 100644 --- a/ushahidi/setup/adminpwd.sql +++ b/ushahidi/setup/adminpwd.sql @@ -4,5 +4,5 @@ INSERT INTO `config` (`group_name`, `config_key`, `config_value`) VALUES ('site', 'name', '"Spotter Cluster"'), ('site', 'email', '"admin@example.com"'), ('site', 'language', '"cs"'), -('data-provider','email','{\"incoming_type\":\"IMAP\",\"incoming_server\":\"localhost\",\"incoming_port\":143,\"incoming_security\":\"None\",\"incoming_username\":\"ushahidi@spotter.ngo\",\"incoming_password\":\"password\",\"outgoing_type\":\"SMTP\",\"outgoing_server\":\"postfix\",\"outgoing_port\":25,\"outgoing_security\":\"None\",\"outgoing_username\":\"ushahidi@spotter.ngo\",\"outgoing_password\":\"password\",\"from\":\"ushahidi@spotter.ngo\",\"from_name\":\"Ushahidi\"}'), +('data-provider','email','{\"incoming_type\":\"IMAP\",\"incoming_server\":\"localhost\",\"incoming_port\":143,\"incoming_security\":\"None\",\"incoming_username\":\"ushahidi@spotter.ngo\",\"incoming_password\":\"password\",\"outgoing_type\":\"SMTP\",\"outgoing_server\":\"host\",\"outgoing_port\":25,\"outgoing_security\":\"None\",\"outgoing_username\":\"ushahidi@spotter.ngo\",\"outgoing_password\":\"password\",\"from\":\"ushahidi@spotter.ngo\",\"from_name\":\"Ushahidi\"}'), ('data-provider','url','\"https:\\/\\/ush.spotter.vm\\/platform\\/api\\/v3\\/config\\/data-provider\"');