Move "postfix" host to "host"

This commit is contained in:
Disassembler 2018-09-14 11:24:04 +02:00
parent 30e2232b71
commit 725ecc75a6
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
15 changed files with 15 additions and 16 deletions

View File

@ -78,7 +78,6 @@ vi 00-install.sh
| ODK Build | opendatakit-build | 8017 | 8080 (HTTP) | odkbuild | | ODK Build | opendatakit-build | 8017 | 8080 (HTTP) | odkbuild |
| OpenMapKit | openmapkit | 8007 | 8080 (HTTP) | omk | | OpenMapKit | openmapkit | 8007 | 8080 (HTTP) | omk |
| Pan.do/ra | pandora | 8002 | 8080 (HTTP) | pandora | | Pan.do/ra | pandora | 8002 | 8080 (HTTP) | pandora |
| Postfix | postfix | 587 | 25 (SMTP) | - |
| Postgres | postgres | 5432 | 5432 (Postgres) | - | | Postgres | postgres | 5432 | 5432 (Postgres) | - |
| RabbitMQ | rabbitmq | 5672 | 5672 (AMQP) | - | | RabbitMQ | rabbitmq | 5672 | 5672 (AMQP) | - |
| Redis | redis | 6379 | 6379 (Redis) | - | | Redis | redis | 6379 | 6379 (Redis) | - |

View File

@ -98,14 +98,14 @@ def update_email(email):
replace_file_line('/srv/sambro/conf/000_config.py', 'settings.mail.approver = ', '"{}"'.format(email)) replace_file_line('/srv/sambro/conf/000_config.py', 'settings.mail.approver = ', '"{}"'.format(email))
# SeedDMS # SeedDMS
if app_exists('seeddms'): if app_exists('seeddms'):
replace_file_line('/srv/seeddms/conf/settings.xml', ' <smtp smtpServer="postfix" smtpPort="25" smtpSendFrom=', '"{}" smtpUser="" smtpPassword=""/>'.format(email)) replace_file_line('/srv/seeddms/conf/settings.xml', ' <smtp smtpServer="host" smtpPort="25" smtpSendFrom=', '"{}" smtpUser="" smtpPassword=""/>'.format(email))
# Sigmah # Sigmah
if app_exists('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.from.address=', email)
replace_file_line('/srv/sigmah/conf/sigmah.properties', 'mail.support.to=', email) replace_file_line('/srv/sigmah/conf/sigmah.properties', 'mail.support.to=', email)
# Ushahidi # Ushahidi
if app_exists('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) 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') run_mysql_query(query, 'ushahidi')
query = 'UPDATE `config` SET `config_value` = "\\"{}\\"" WHERE `group_name` LIKE "site" AND `config_key` LIKE "email";'.format(email) query = 'UPDATE `config` SET `config_value` = "\\"{}\\"" WHERE `group_name` LIKE "site" AND `config_key` LIKE "email";'.format(email)

View File

@ -199,7 +199,7 @@ ckan.hide_activity_from_users = %(ckan.site_id)s
#email_to = errors@example.com #email_to = errors@example.com
#error_email_from = ckan-errors@example.com #error_email_from = ckan-errors@example.com
smtp.server = postfix smtp.server = host
smtp.starttls = False smtp.starttls = False
#smtp.user = username@example.com #smtp.user = username@example.com
#smtp.password = your_password #smtp.password = your_password

View File

@ -16,7 +16,7 @@ Rails.application.configure do
config.consider_all_requests_local = false config.consider_all_requests_local = false
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
ActionMailer::Base.smtp_settings = { ActionMailer::Base.smtp_settings = {
:address => 'postfix' :address => 'host'
} }
config.action_mailer.default_url_options = { config.action_mailer.default_url_options = {
:host => 'www.crisiscleanup.org', :host => 'www.crisiscleanup.org',

View File

@ -12,4 +12,4 @@ ssl_webdav = False
[email] [email]
from = admin@example.com from = admin@example.com
uri = smtp://postfix:25 uri = smtp://host:25

View File

@ -44,7 +44,7 @@ define('MAIL_FROM', 'admin@example.com');
define('MAIL_TRANSPORT', 'smtp'); define('MAIL_TRANSPORT', 'smtp');
// SMTP configuration to use when the "smtp" transport is chosen // 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_PORT', 25);
define('MAIL_SMTP_USERNAME', ''); define('MAIL_SMTP_USERNAME', '');
define('MAIL_SMTP_PASSWORD', ''); define('MAIL_SMTP_PASSWORD', '');

View File

@ -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` = "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` = "" 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"; UPDATE `c_external_service_properties` SET `value` = "false" WHERE `external_service_id` = 2 and `name` LIKE "useTLS";

View File

@ -1,2 +1,2 @@
mail.host=postfix mail.host=host
mail.port=25 mail.port=25

View File

@ -11,7 +11,7 @@ DB_GIN_TRGM = True
BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@rabbitmq:5672//pandora' BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@rabbitmq:5672//pandora'
EMAIL_HOST = 'postfix' EMAIL_HOST = 'host'
XACCELREDIRECT = True XACCELREDIRECT = True

View File

@ -92,7 +92,7 @@ settings.auth.hmac_key = "${SAHANADEMO_HMAC}"
# Email settings # Email settings
# Outbound server # Outbound server
settings.mail.server = "postfix:25" settings.mail.server = "host:25"
#settings.mail.tls = True #settings.mail.tls = True
# Useful for Windows Laptops: # Useful for Windows Laptops:
# https://www.google.com/settings/security/lesssecureapps # https://www.google.com/settings/security/lesssecureapps

View File

@ -92,7 +92,7 @@ settings.auth.hmac_key = "${SAHANA_HMAC}"
# Email settings # Email settings
# Outbound server # Outbound server
settings.mail.server = "postfix:25" settings.mail.server = "host:25"
#settings.mail.tls = True #settings.mail.tls = True
# Useful for Windows Laptops: # Useful for Windows Laptops:
# https://www.google.com/settings/security/lesssecureapps # https://www.google.com/settings/security/lesssecureapps

View File

@ -92,7 +92,7 @@ settings.auth.hmac_key = "${SAMBRO_HMAC}"
# Email settings # Email settings
# Outbound server # Outbound server
settings.mail.server = "postfix:25" settings.mail.server = "host:25"
#settings.mail.tls = True #settings.mail.tls = True
# Useful for Windows Laptops: # Useful for Windows Laptops:
# https://www.google.com/settings/security/lesssecureapps # https://www.google.com/settings/security/lesssecureapps

View File

@ -14,7 +14,7 @@
</connectors> </connectors>
</authentication> </authentication>
<database dbDriver="pgsql" dbHostname="postgres" dbDatabase="seeddms" dbUser="seeddms" dbPass="${SEEDDMS_PWD}" doNotCheckVersion="false"/> <database dbDriver="pgsql" dbHostname="postgres" dbDatabase="seeddms" dbUser="seeddms" dbPass="${SEEDDMS_PWD}" doNotCheckVersion="false"/>
<smtp smtpServer="postfix" smtpPort="25" smtpSendFrom="admin@example.com" smtpUser="" smtpPassword=""/> <smtp smtpServer="host" smtpPort="25" smtpSendFrom="admin@example.com" smtpUser="" smtpPassword=""/>
</system> </system>
<advanced> <advanced>
<display siteDefaultPage="" rootFolderID="1" titleDisplayHack="true" showMissingTranslations="false"/> <display siteDefaultPage="" rootFolderID="1" titleDisplayHack="true" showMissingTranslations="false"/>

View File

@ -22,7 +22,7 @@ files.upload.maxSize=20971520
# MAILS # MAILS
# -- # --
mail.hostname=postfix mail.hostname=host
mail.port=25 mail.port=25
mail.from.address=admin@example.com mail.from.address=admin@example.com
mail.from.name=Sigmah mail.from.name=Sigmah

View File

@ -4,5 +4,5 @@ INSERT INTO `config` (`group_name`, `config_key`, `config_value`) VALUES
('site', 'name', '"Spotter Cluster"'), ('site', 'name', '"Spotter Cluster"'),
('site', 'email', '"admin@example.com"'), ('site', 'email', '"admin@example.com"'),
('site', 'language', '"cs"'), ('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\"'); ('data-provider','url','\"https:\\/\\/ush.spotter.vm\\/platform\\/api\\/v3\\/config\\/data-provider\"');