Commit 996fb5fe authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Incluye layout de email como recurso de config

See merge request redmic-project/postgres/postgresql!30
parents 7600642e 00b064c8

Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM postgres:10.3

FROM postgres:10.6



LABEL maintainer="info@redmic.es"
@@ -7,7 +7,7 @@ ENV PG_PORT="5432" \ 
	PG_SHARED_PRELOAD_LIBRARIES="pg_cron" \

	POSTGRES_USER="postgres" \

	POSTGRES_PASSWORD="password" \

	PG_POSTGIS_VERSION="2.4" \

	PG_POSTGIS_VERSION="2.5" \

	CONFIG_PATH="/"



COPY scripts /tmp

deploy/config/layout.mustache

0 → 100644
+71 −0
Original line number Diff line number Diff line 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head>

	<title>REDMIC. Repositorio de Datos Marinos Integrados de Canarias</title>

	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

	<style type="text/css">.social a{text-decoration:none;color:#fff}@media only screen and (min-width:0){.wrapper{text-rendering:optimizeLegibility}}@media only screen and (max-width:620px){[class=wrapper]{min-width:280px!important;width:100%!important}[class=wrapper] .one-col,[class=wrapper] .two-col,[class=wrapper] .three-col{width:280px!important}[class=wrapper] .column,[class=wrapper] .gutter{display:block;float:left;width:280px!important}[class=wrapper] .padded{padding-left:20px!important;padding-right:20px!important}[class=wrapper] .block{display:block!important}[class=wrapper] .hide{display:none!important}[class=wrapper] .image{margin-bottom:20px!important}[class=wrapper] .image img{height:auto!important;width:100%!important}}@media (-webkit-min-device-pixel-ratio:1.5) and (min-width:620px),(min-resolution:144dpi) and (min-width:620px){.one-col .column .contents ul li{padding-left:38px!important}.two-col .column .contents ul li{padding-left:38px!important}.three-col .column .contents ul li,.two-col .column-narrower .contents ul li{padding-left:28px!important}.two-col .column-narrower .contents ul li{padding-left:28px!important}}@media (-webkit-min-device-pixel-ratio:1.5),(min-resolution:144dpi),(max-width:620px){[class=wrapper] .one-col-feature blockquote{background-size:30px!important;background-position:50% 100%!important}[class=wrapper] .one-col-feature blockquote p:first-child,[class=wrapper] .one-col-feature blockquote h1:first-child,[class=wrapper] .one-col-feature blockquote h2:first-child,[class=wrapper] .one-col-feature blockquote h3:first-child,[class=wrapper] .one-col-feature blockquote ol:first-child,[class=wrapper] .one-col-feature blockquote ul:first-child{background-size:30px!important;background-position:50% 0!important}[class=wrapper] .contents ul{margin-left:0!important}[class=wrapper] .contents ul li{list-style-type:none!important;list-style-image:none!important;background-size:10px 10px!important;background-position:0 5px!important}[class=wrapper] .one-col-feature ul{margin-left:0!important}[class=wrapper] .one-col-feature ul li{list-style:none!important;background-size:20px!important;background-position:0 9px!important;padding-left:50px}}@media (-webkit-min-device-pixel-ratio:1.5) and (max-width:620px),(min-resolution:144dpi) and (max-width:620px){[class=wrapper] .one-col ul{margin-left:0!important;border:0!important}}@media only screen and (max-width:620px){[class=wrapper] .one-col .contents blockquote p,[class=wrapper] .two-col .contents blockquote p,[class=wrapper] .three-col .contents blockquote p,[class=wrapper] .one-col .contents blockquote h1,[class=wrapper] .two-col .contents blockquote h1,[class=wrapper] .three-col .contents blockquote h1,[class=wrapper] .one-col .contents blockquote h2,[class=wrapper] .two-col .contents blockquote h2,[class=wrapper] .three-col .contents blockquote h2,[class=wrapper] .one-col .contents blockquote h3,[class=wrapper] .two-col .contents blockquote h3,[class=wrapper] .three-col .contents blockquote h3,[class=wrapper] .one-col .contents blockquote ol,[class=wrapper] .two-col .contents blockquote ol,[class=wrapper] .three-col .contents blockquote ol,[class=wrapper] .one-col .contents blockquote ul,[class=wrapper] .two-col .contents blockquote ul,[class=wrapper] .three-col .contents blockquote ul{padding-left:38px!important}[class=wrapper] .column table td table:nth-last-child(2) td h1:last-child,[class=wrapper] .column-wider table td table:nth-last-child(2) td h1:last-child,[class=wrapper] .column-narrower table td table:nth-last-child(2) td h1:last-child,[class=wrapper] .column table td table:nth-last-child(2) td h2:last-child,[class=wrapper] .column-wider table td table:nth-last-child(2) td h2:last-child,[class=wrapper] .column-narrower table td table:nth-last-child(2) td h2:last-child,[class=wrapper] .column table td table:nth-last-child(2) td h3:last-child,[class=wrapper] .column-wider table td table:nth-last-child(2) td h3:last-child,[class=wrapper] .column-narrower table td table:nth-last-child(2) td h3:last-child,[class=wrapper] .column table td table:nth-last-child(2) td p:last-child,[class=wrapper] .column-wider table td table:nth-last-child(2) td p:last-child,[class=wrapper] .column-narrower table td table:nth-last-child(2) td p:last-child,[class=wrapper] .column table td table:nth-last-child(2) td ol:last-child,[class=wrapper] .column-wider table td table:nth-last-child(2) td ol:last-child,[class=wrapper] .column-narrower table td table:nth-last-child(2) td ol:last-child,[class=wrapper] .column table td table:nth-last-child(2) td ul:last-child,[class=wrapper] .column-wider table td table:nth-last-child(2) td ul:last-child,[class=wrapper] .column-narrower table td table:nth-last-child(2) td ul:last-child{margin-bottom:20px!important}[class=wrapper] .contents blockquote{background-size:27px!important}[class=wrapper] .contents ul li{padding-left:38px!important}[class=wrapper] .contents ol li{padding-left:18px!important}[class=wrapper] .spacer{display:none!important}[class=wrapper] .header .logo{padding:40px 0!important;width:280px!important}[class=wrapper] .header .logo div{font-size:24px!important;line-height:1.3em!important;margin-bottom:0!important}[class=wrapper] .header .logo div img{display:inline-block!important;max-width:280px!important;height:auto!important}[class=wrapper] .preheader-buffer{font-size:10px!important;line-height:10px!important}[class=wrapper] .preheader .webversion,[class=wrapper] .header .logo a{text-align:center!important}[class=wrapper] [class*=contents] blockquote p{font-size:18px!important;line-height:26px!important}[class=wrapper] [class*=contents] h1{font-size:30px!important;line-height:44px!important;margin-bottom:16px!important}[class=wrapper] [class*=contents] h2{font-size:20px!important;line-height:28px!important;margin-bottom:16px!important}[class=wrapper] [class*=contents] h3{font-size:16px!important;line-height:22px!important;margin-bottom:12px!important}[class=wrapper] .column-wider,[class=wrapper] .column-narrower{display:block;float:left;width:280px!important}[class=wrapper] .one-col-feature{width:280px!important}[class=wrapper] .one-col-feature li{font-size:18px!important;line-height:28px!important}[class=wrapper] .one-col-feature ol{margin-left:22px!important}[class=wrapper] .one-col-feature ol li{padding-left:18px!important}[class=wrapper] .one-col-feature ul li{background-size:10px!important;padding-left:40px!important}[class=wrapper] .one-col-feature blockquote p,[class=wrapper] .one-col-feature blockquote h1,[class=wrapper] .one-col-feature blockquote h2,[class=wrapper] .one-col-feature blockquote h3,[class=wrapper] .one-col-feature blockquote ol,[class=wrapper] .one-col-feature blockquote ul{font-size:26px!important;line-height:40px!important}[class=wrapper] .btn a{padding:15px 10px!important;width:220px!important}[class=wrapper] .gutter{font-size:10px;line-height:10px;height:10px!important}[class=wrapper] table.one-col,[class=wrapper] table.one-col-feature,[class=wrapper] td.last{margin-bottom:10px!important}[class=wrapper] ol,[class=wrapper] ul{margin-left:20px!important}[class=wrapper] .preheader [class*=column]{display:block!important;text-align:center!important}[class=wrapper] .preheader .title{display:none!important}[class=wrapper] .footer .inner{padding-top:15px!important;padding-bottom:15px!important;width:280px!important}[class=wrapper] .footer .campaign,[class=wrapper] .footer .social{display:block!important;margin-bottom:15px!important;padding-top:15px!important;text-align:center!important;width:auto!important}[class=wrapper] .footer .padded{margin:0!important}[class=wrapper] .one-col .divider table,[class=wrapper] .two-col .column .divider table,[class=wrapper] .two-col .column-narrower .divider table,[class=wrapper] .two-col .column-wider .divider table,[class=wrapper] .three-col .divider table{background-size:auto 6px!important;width:240px!important}[class=wrapper] .one-col .divider table img,[class=wrapper] .two-col .column .divider table img,[class=wrapper] .two-col .column-narrower .divider table img,[class=wrapper] .two-col .column-wider .divider table img,[class=wrapper] .three-col .divider table img{display:none!important}}</style><meta name="robots" content="noindex,nofollow">

	<meta property="og:title" content="REDMIC - Repositorio de Datos Marinos Integrados de Canarias">

	<style type="text/css">@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,600,400);body,h1,p,div,span{font-family:'Open Sans',sans-serif!important}</style></head><body style="margin:0;padding:0;background-color:#fafafa;margin:0;mso-line-height-rule:exactly;padding:0;min-width:100%;padding:30px 0">

	<div style="margin:0;padding:0;background-color:#fafafa;margin:0;mso-line-height-rule:exactly;padding:0;min-width:100%;padding:30px 0">

	<table cellspacing="0" cellpadding="0" border="0" align="center" style="width:80%">

		<tbody>

			<tr>

				<td>

					<center class="wrapper" style="display:table;table-layout:fixed;width:100%;min-width:620px;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%">

						<div class="column-top" style="padding-top:10px;padding-bottom:15px;text-align:center">

							<a href="https://www.redmic.es/" target="_blank">

								<img style="width:300px" src="https://www.redmic.es/resources/images/logos/redmicSimple.png">

							</a>

						</div>

						<table class="one-col centered" style="border:1px solid #d2d2d2;background-color:#FDFDFD;border-collapse:collapse;border-spacing:0;min-height:300px;width:100%;margin-left:auto;margin-right:auto">

							<tbody>

								<tr>

									<td class="column" style="padding:0;vertical-align:top;text-align:left;padding-left:20px;padding-right:20px">

										<h1 style="margin-top:0;font-weight:400;color:#222;font-size:18px;font-weight:700;line-height:44px">	{{{title}}}

										</h1>

										<p style="margin-top:16px;font-weight:400;color:#7D7D7D;font-size:14px;line-height:22px;margin-bottom:20px">

											{{{content}}}

										</p>

									</td>

								</tr>

							</tbody>

						</table>

						<table class="footer" style="border-collapse:collapse;border-spacing:0;table-layout:fixed;width:100%;background-color:#161616">

							<tbody>

								<tr>

									<td style="padding:0;vertical-align:top;text-align:left;color:#e6e6e6">&nbsp;</td>

									<td class="inner" style="padding:0;text-align:left;color:#e6e6e6;padding-top:15px;padding-bottom:15px;width:560px">

										<table style="border-collapse:collapse;border-spacing:0;width:100%">

											<tbody>

												<tr>

													<td class="campaign" style="padding:0;text-align:left;color:#e6e6e6;font-size:12px;line-height:15px">

														<div style="color:white">Edificio Puerto Ciudad, oficina 1-B</div>

														<div style="color:white">Muelle de Enlace 38001</div>

														<div style="color:#fff;margin-bottom:5px">Santa Cruz de Tenerife</div>

														

													</td>

													<td class="social" style="font-size:12px;padding:0;color:#e6e6e6;text-align:left;width:190px">

														<div class="padded" style="padding-left:40px;padding-right:40px;margin-left:20px;padding:0">

															<div style="">

																<a href="https://twitter.com/redmic_oag" target="_blank">

																	<tweet><img style="border:0;-ms-interpolation-mode:bicubic;vertical-align:middle" src="https://www.redmic.es/resources/images/logos/twitter-light.png" alt="" width="38" height="30"><span>Twitter</span><tweet>

																</tweet></tweet></a>

															</div>

														</div>

													</td>

												</tr>

											</tbody>

										</table>

									</td>

									<td style="padding:0;vertical-align:top;text-align:left;color:#e6e6e6">&nbsp;</td>

								</tr>

							</tbody>

						</table>

					</center>

				</td>

			</tr>

		</tbody>

	</table>

	<div>

</div></div></body>

</html>
 
 No newline at end of file

deploy/docker-compose.postgresql.tmpl.yml

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ services: 
    volumes:

      - postgres-data-vol:/var/lib/postgresql/data

      - postgres-wal-vol:/postgresql/wal

    configs:

      - source: mail-layout

        target: /home/REDMIC/Mail/dist/layout.mustache

    deploy:

      mode: replicated

      replicas: 1
@@ -25,3 +28,8 @@ services: 
networks:

  postgres-net:

    external: true



configs:

  mail-layout:

    name: ${MAIL_LAYOUT_NAME:-mail-layout}

    file: ./config/layout.mustache