Move "postfix" host to "host"
This commit is contained in:
parent
30e2232b71
commit
725ecc75a6
@ -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) | - |
|
||||
|
@ -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', ' <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
|
||||
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)
|
||||
|
@ -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
|
||||
|
@ -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',
|
||||
|
@ -12,4 +12,4 @@ ssl_webdav = False
|
||||
|
||||
[email]
|
||||
from = admin@example.com
|
||||
uri = smtp://postfix:25
|
||||
uri = smtp://host:25
|
||||
|
@ -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', '');
|
||||
|
@ -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";
|
||||
|
@ -1,2 +1,2 @@
|
||||
mail.host=postfix
|
||||
mail.host=host
|
||||
mail.port=25
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -14,7 +14,7 @@
|
||||
</connectors>
|
||||
</authentication>
|
||||
<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>
|
||||
<advanced>
|
||||
<display siteDefaultPage="" rootFolderID="1" titleDisplayHack="true" showMissingTranslations="false"/>
|
||||
|
@ -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
|
||||
|
@ -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\"');
|
||||
|
Loading…
Reference in New Issue
Block a user