diff --git a/.gitmodules b/.gitmodules index 28770e46d05930c7f2b342a98e70062be3be85ef..97112d748142dd60fbe08f5eb2cc308e332b60a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "duniter4j-cesium/src/main/cesium"] - path = duniter4j-cesium/src/main/cesium - url = git://github.com/duniter/cesium.git [submodule "duniter4j-elasticsearch/src/main/resources/cities"] path = duniter4j-elasticsearch/src/main/resources/cities url = git://github.com/David-Haim/CountriesToCitiesJSON.git diff --git a/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml b/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml index 46095a0f1a870e4e4400f7a142ea12d25fd12e77..184f1a706f38af1e13b7547098686fc32d0b36d2 100644 --- a/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml +++ b/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml @@ -249,4 +249,19 @@ duniter.subscription.enable: false # # Email subscription: URL to a Cesium site, for links in the email content (default: https://g1.duniter.fr) # -# duniter.subscription.email.cesium.url: 'http://domain.com/cesium' \ No newline at end of file +# duniter.subscription.email.cesium.url: 'http://domain.com/cesium' +# +# ---------------------------------- Duniter4j User (profile, message) module ------------------- +# +# +# Share link: `og:site_name` (default: 'Cesium') +# +# duniter.user.share.site.name: 'Cesium - Ğ1' +# +# Share link: `og:url` - URL to a Cesium site, for links in the email content (default: https://g1.duniter.fr) +# +# duniter.share.cesium.url: 'https://domain.com/cesium' +# +# Share link: Base URL of the ES cluster, to resolve `og:image` URL (default: none => /!\ Will use relative image path) +# +# duniter.share.base.url: 'https://data.domain.com' \ No newline at end of file diff --git a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml index cd42a48aef7696c6608cfdeddb046cd5b3e8763a..124f71b8c5443388105ff26fe60d1b987a37dcab 100644 --- a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml +++ b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml @@ -251,4 +251,19 @@ duniter.subscription.enable: true # # Email subscription: URL to a Cesium site, for links in the email content (default: https://g1.duniter.fr) # -#duniter.subscription.email.cesium.url: 'https://domain.com/cesium' \ No newline at end of file +#duniter.subscription.email.cesium.url: 'https://domain.com/cesium' +# +# ---------------------------------- Duniter4j User (profile, message) module ------------------- +# +# +# Share link: og:site_name (default: 'Cesium') +# +# duniter.user.share.site.name: 'Cesium - Ğ1' +# +# Share link : URL to a Cesium site, for links in the email content (default: https://g1.duniter.fr) +# +#duniter.share.cesium.url: 'https://domain.com/cesium' +# +# Share link : Base URL of cluster, to resolve image (default: none => /!\ Will use relative image path) +# +#duniter.share.base.url: 'http://localhost:9200' \ No newline at end of file diff --git a/duniter4j-es-core/pom.xml b/duniter4j-es-core/pom.xml index a2d3ebe77f40fd014d06a026471b2eb6e76da2e6..4a5ecfd698a69dacfc8b15a0d2ed4a1e495abfc5 100644 --- a/duniter4j-es-core/pom.xml +++ b/duniter4j-es-core/pom.xml @@ -76,6 +76,14 @@ jackson-databind + + + org.antlr + stringtemplate + ${stringtemplate.version} + compile + + net.java.dev.jna diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/attachment/RestImageAttachmentAction.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/attachment/RestImageAttachmentAction.java index f861333dfd6230a9538538c5b4135ebbe8273bbc..e46a5926a10e170d5e51eadbb46875330ee65794 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/attachment/RestImageAttachmentAction.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/attachment/RestImageAttachmentAction.java @@ -95,4 +95,17 @@ public class RestImageAttachmentAction extends BaseRestHandler { } }); } + + + public static String computeImageUrl(String index, + String type, + String id, + String imageField, + String contentType) { + + int lastSlashIndex = contentType != null ? contentType.lastIndexOf('/') : -1; + String extension = (lastSlashIndex >= 0) ? contentType.substring(lastSlashIndex+1) : contentType; + + return String.format("/%s/%s/%s/_image/%s.%s", index, type, id, imageField, extension); + } } \ No newline at end of file diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/share/AbstractRestShareLinkAction.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/share/AbstractRestShareLinkAction.java new file mode 100644 index 0000000000000000000000000000000000000000..ff97fada10df8a93d416f847e86196295e3c881b --- /dev/null +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/rest/share/AbstractRestShareLinkAction.java @@ -0,0 +1,91 @@ +package org.duniter.elasticsearch.rest.share; + +import org.apache.http.entity.ContentType; +import org.duniter.core.exception.BusinessException; +import org.duniter.core.util.Preconditions; +import org.duniter.core.util.StringUtils; +import org.duniter.elasticsearch.exception.DuniterElasticsearchException; +import org.duniter.elasticsearch.rest.XContentThrowableRestResponse; +import org.duniter.elasticsearch.util.opengraph.OGData; +import org.duniter.elasticsearch.util.springtemplate.STUtils; +import org.elasticsearch.client.Client; +import org.elasticsearch.common.logging.ESLogger; +import org.elasticsearch.common.logging.Loggers; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.rest.*; +import org.nuiton.i18n.I18n; +import org.stringtemplate.v4.*; + +import java.util.Locale; + +import static org.elasticsearch.rest.RestRequest.Method.GET; +import static org.elasticsearch.rest.RestStatus.OK; + +public abstract class AbstractRestShareLinkAction extends BaseRestHandler { + + protected final ESLogger log; + + public interface OGDataResolver { + OGData resolve(String id) throws DuniterElasticsearchException, BusinessException; + } + + private OGDataResolver resolver; + private STGroup templates; + + public AbstractRestShareLinkAction(Settings settings, RestController controller, Client client, + String indexName, + String typeName, + OGDataResolver resolver + ) { + super(settings, controller, client); + log = Loggers.getLogger("duniter.rest." + indexName, settings, String.format("[%s]", indexName)); + controller.registerHandler(GET, + String.format("/%s/%s/{id}/_share", indexName, typeName), + this); + this.resolver = resolver; + + // Configure springtemplate engine + this.templates = STUtils.newSTGroup("org/duniter/elasticsearch/templates"); + Preconditions.checkNotNull(this.templates.getInstanceOf("html_share"), "Unable to load ST template for share page"); + + } + + @Override + protected void handleRequest(final RestRequest request, RestChannel restChannel, Client client) throws Exception { + String id = request.param("id"); + + try { + + OGData data = resolver.resolve(id); + Preconditions.checkNotNull(data); + Preconditions.checkNotNull(data.title); + + // Compute HTML content + ST template = templates.getInstanceOf("html_share"); + template.add("type", data.type); + template.add("title", data.title); + template.add("summary", StringUtils.truncate(data.description, 500)); + template.add("description", data.description); + template.add("siteName", data.siteName); + template.add("image", data.image); + template.add("url", data.url); + template.add("locale", data.locale); + if (StringUtils.isNotBlank(data.url)) { + Locale locale = data.locale != null ? new Locale(data.locale) : I18n.getDefaultLocale(); + template.add("redirectMessage", I18n.l(locale, "duniter4j.share.redirection.help")); + } + + String html = template.render(); + + restChannel.sendResponse(new BytesRestResponse(OK, ContentType.TEXT_HTML.getMimeType(), html)); + } + catch(DuniterElasticsearchException | BusinessException e) { + log.error(e.getMessage(), e); + restChannel.sendResponse(new XContentThrowableRestResponse(request, e)); + } + catch(Exception e) { + log.error(e.getMessage(), e); + } + } + +} diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/opengraph/OGData.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/opengraph/OGData.java new file mode 100644 index 0000000000000000000000000000000000000000..0530ead6288cd913cacb01fc7fc11883688e864b --- /dev/null +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/opengraph/OGData.java @@ -0,0 +1,13 @@ +package org.duniter.elasticsearch.util.opengraph; + +public class OGData { + public String type; + public String title; + public String description; + public String image; + public String url; + public String locale; + public String imageType; + public String siteName; + +} diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/DateRenderer.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/DateRenderer.java new file mode 100644 index 0000000000000000000000000000000000000000..507fd6169aa0a88bfac49f54f0117eb58e2bf46a --- /dev/null +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/DateRenderer.java @@ -0,0 +1,67 @@ +package org.duniter.elasticsearch.util.springtemplate; + +/*- + * #%L + * Duniter4j :: ElasticSearch Subscription plugin + * %% + * Copyright (C) 2014 - 2017 EIS + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + * #L% + */ + +import org.stringtemplate.v4.AttributeRenderer; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +public class DateRenderer implements AttributeRenderer { + + public DateRenderer() { + } + + public String toString(Object o, String formatString, Locale locale) { + if(formatString == null) { + formatString = "short"; + } + + Date d; + if(o instanceof Calendar) { + d = ((Calendar)o).getTime(); + } else { + d = (Date)o; + } + + Integer styleI = (Integer)org.stringtemplate.v4.DateRenderer.formatToInt.get(formatString); + Object f; + if(styleI == null) { + f = new SimpleDateFormat(formatString, locale); + } else { + int style = styleI.intValue(); + if(formatString.startsWith("date:")) { + f = DateFormat.getDateInstance(style, locale); + } else if(formatString.startsWith("time:")) { + f = DateFormat.getTimeInstance(style, locale); + } else { + f = DateFormat.getDateTimeInstance(style, style, locale); + } + } + + return ((DateFormat)f).format(d); + } +} \ No newline at end of file diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/STUtils.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/STUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..cd0cb61b9f40bc0a38a92d411daa633c35253073 --- /dev/null +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/STUtils.java @@ -0,0 +1,25 @@ +package org.duniter.elasticsearch.util.springtemplate; + +import org.stringtemplate.v4.DateRenderer; +import org.stringtemplate.v4.STGroup; +import org.stringtemplate.v4.STGroupDir; +import org.stringtemplate.v4.StringRenderer; + +import java.util.Date; + +public class STUtils { + + private STUtils() { + /*help class*/ + } + + public static STGroup newSTGroup(String dirName) { + // Configure springtemplate engine + STGroup templates = new STGroupDir(dirName, '$', '$'); + templates.registerRenderer(Date.class, new DateRenderer()); + templates.registerRenderer(String.class, new StringRenderer()); + return templates; + } + + +} diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/StringRenderer.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/StringRenderer.java new file mode 100644 index 0000000000000000000000000000000000000000..01e3ac3e5ebfcbaf053a22c9efed87f7250854c7 --- /dev/null +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/util/springtemplate/StringRenderer.java @@ -0,0 +1,52 @@ +package org.duniter.elasticsearch.util.springtemplate; + +/*- + * #%L + * Duniter4j :: ElasticSearch Subscription plugin + * %% + * Copyright (C) 2014 - 2017 EIS + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + * #L% + */ + +import org.duniter.core.client.model.ModelUtils; +import org.duniter.core.util.CollectionUtils; +import org.nuiton.i18n.I18n; + +import java.util.Locale; + +/** + * Add format capabilities: i18n, pubkey + * Created by blavenie on 10/04/17. + */ +public class StringRenderer extends org.stringtemplate.v4.StringRenderer{ + + @Override + public String toString(Object o, String formatString, Locale locale) { + return formatString == null ? (String)o : + (formatString.equals("pubkey") ? ModelUtils.minifyPubkey((String)o) : + (formatString.startsWith("i18n") ? toI18nString(o, formatString, locale) : + super.toString(o, formatString, locale))); + } + + protected String toI18nString(Object key, String formatString, Locale locale) { + String[] params = formatString.startsWith("i18n:") ? formatString.substring(5).split(",") : null; + if (CollectionUtils.isNotEmpty(params)) { + return I18n.l(locale, key.toString(), params); + } + return I18n.l(locale, key.toString()); + } +} diff --git a/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_en_GB.properties b/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_en_GB.properties index 4ada9bb98edcc894fcc032a9291ca10215d21b6d..9a1bb01daa4734bbaf2aff4f6a3c15a5847620e3 100644 --- a/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_en_GB.properties +++ b/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_en_GB.properties @@ -47,6 +47,7 @@ duniter4j.job.stopped= duniter4j.job.stopping= duniter4j.job.success= duniter4j.service.waitThenRetry=Error [%s]... will retry [%s/%s] +duniter4j.share.redirection.help=If you are not redirected automatically, follow this link\: duniter4j.task.issuer.system=System duniter4j.task.starting=Starting task... duniter4j.threadPool.clusterHealthStatus.changed=Cluster health status changed to [%s] diff --git a/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_fr_FR.properties b/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_fr_FR.properties index a2854149be7a599f50ed4b957d98b93c52e422dd..43a57823caeaca108c0a12c4a9d9f8cb79baa43a 100644 --- a/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_fr_FR.properties +++ b/duniter4j-es-core/src/main/resources/i18n/duniter4j-es-core_fr_FR.properties @@ -49,6 +49,7 @@ duniter4j.job.stopped= duniter4j.job.stopping= duniter4j.job.success= duniter4j.service.waitThenRetry=Echec [%s]... tentative [%s/%s] +duniter4j.share.redirection.help=Si vous n'êtes pas redirigé automatiquement, cliquez sur le lien suivant \: duniter4j.task.issuer.system=Système duniter4j.task.starting=Démarrage du traitement... duniter4j.threadPool.clusterHealthStatus.changed=Cluster health status changed to [%s] diff --git a/duniter4j-es-subscription/src/main/resources/templates/cesium_logo.st b/duniter4j-es-core/src/main/resources/org/duniter/elasticsearch/templates/cesium_logo.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/cesium_logo.st rename to duniter4j-es-core/src/main/resources/org/duniter/elasticsearch/templates/cesium_logo.st diff --git a/duniter4j-es-core/src/main/resources/org/duniter/elasticsearch/templates/html_share.st b/duniter4j-es-core/src/main/resources/org/duniter/elasticsearch/templates/html_share.st new file mode 100644 index 0000000000000000000000000000000000000000..664245e3511d95a8b6d5d74c8825c691e38b178d --- /dev/null +++ b/duniter4j-es-core/src/main/resources/org/duniter/elasticsearch/templates/html_share.st @@ -0,0 +1,64 @@ +html_share(type, title, summary, description, image, siteName, locale, url, redirectMessage) ::= << + + + + + $if(siteName)$ + $siteName$ | $title$ + $else$ + $title$ + $endif$ + + $if(type)$ + + $else$ + + $endif$ + + + + $if(summary)$ + + $else$ + + $endif$ + + $if(siteName)$ + + $endif$ + + $if(image)$ + + $endif$ + + $if(locale)$ + + $endif$ + + $if(url)$ + + + + $endif$ + + + $if(image)$ +

+ +

+ $endif$ + +

$title$

+ +

$description$

+ + $if(url)$ +

+ $redirectMessage$ $title$. +

+ $endif$ + + +>> diff --git a/duniter4j-es-subscription/pom.xml b/duniter4j-es-subscription/pom.xml index c9beba4083d42dc7e961e6f0883ef92419a51fd9..c2ccb92692bfefbb8cd6eac45c731daf224d0934 100644 --- a/duniter4j-es-subscription/pom.xml +++ b/duniter4j-es-subscription/pom.xml @@ -46,7 +46,7 @@ org.antlr stringtemplate ${stringtemplate.version} - compile + provided diff --git a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java index 871c8863dfa34d6654879fae2f3508fa16b4dc30..5f93f052166cc1abf1767bf27afacf380c409d42 100644 --- a/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java +++ b/duniter4j-es-subscription/src/main/java/org/duniter/elasticsearch/subscription/service/SubscriptionService.java @@ -51,6 +51,7 @@ import org.duniter.elasticsearch.user.service.AdminService; import org.duniter.elasticsearch.user.service.MailService; import org.duniter.elasticsearch.user.service.UserEventService; import org.duniter.elasticsearch.user.service.UserService; +import org.duniter.elasticsearch.util.springtemplate.STUtils; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.unit.TimeValue; import org.nuiton.i18n.I18n; @@ -76,6 +77,7 @@ public class SubscriptionService extends AbstractService { private UserEventService userEventService; private UserService userService; private String emailSubjectPrefix; + private STGroup templates; @Inject public SubscriptionService(Duniter4jClient client, @@ -100,6 +102,11 @@ public class SubscriptionService extends AbstractService { if (StringUtils.isNotBlank(emailSubjectPrefix)) { emailSubjectPrefix += " "; // add one trailing space } + + // Configure springtemplate engine + templates = STUtils.newSTGroup("org/duniter/elasticsearch/subscription/templates"); + Preconditions.checkNotNull(templates.getInstanceOf("text_email"), "Missing ST template {text_email}"); + Preconditions.checkNotNull(templates.getInstanceOf("html_email_content"), "Missing ST template {html_email_content}"); } public String create(String json) { @@ -308,11 +315,7 @@ public class SubscriptionService extends AbstractService { subscription.getContent().getLocale().split("-") : new String[]{"en", "GB"}; Locale issuerLocale = localParts.length >= 2 ? new Locale(localParts[0].toLowerCase(), localParts[1].toUpperCase()) : new Locale(localParts[0].toLowerCase()); - // Configure templates engine - STGroup templates = new STGroupDir("templates", '$', '$'); - templates.registerRenderer(Date.class, new DateRenderer()); - templates.registerRenderer(String.class, new StringRenderer()); - //templates.registerRenderer(Number.class, new NumberRenderer()); + // Compute text content final String text = fillTemplate( diff --git a/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/cesium_logo.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/cesium_logo.st new file mode 100644 index 0000000000000000000000000000000000000000..83cf445c1c6d63f4dfb4612f81a06253aff3769b --- /dev/null +++ b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/cesium_logo.st @@ -0,0 +1,6 @@ +cesium_logo(url, data) ::= << +$if(data)$ +$else$ + +$endif$ +>> \ No newline at end of file diff --git a/duniter4j-es-subscription/src/main/resources/templates/css.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/css.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/css.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/css.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/css_logo.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/css_logo.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/css_logo.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/css_logo.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/event_item.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/event_item.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/event_item.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/event_item.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/html.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/html.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/html.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/html.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/html_email_content.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/html_email_content.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/html_email_content.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/html_email_content.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/html_event_item.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/html_event_item.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/html_event_item.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/html_event_item.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/i18n.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/i18n.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/i18n.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/i18n.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/i18n_args.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/i18n_args.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/i18n_args.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/i18n_args.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/text_email.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/text_email.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/text_email.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/text_email.st diff --git a/duniter4j-es-subscription/src/main/resources/templates/text_event_item.st b/duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/text_event_item.st similarity index 100% rename from duniter4j-es-subscription/src/main/resources/templates/text_event_item.st rename to duniter4j-es-subscription/src/main/resources/org/duniter/elasticsearch/subscription/templates/text_event_item.st diff --git a/duniter4j-es-subscription/src/main/resources/plugin-security.policy b/duniter4j-es-subscription/src/main/resources/plugin-security.policy index 3ea59400b9bd2a3d0e1b89091169fa50b60e1123..ea5437f6726c44547a1dce7470385fc69c055e22 100644 --- a/duniter4j-es-subscription/src/main/resources/plugin-security.policy +++ b/duniter4j-es-subscription/src/main/resources/plugin-security.policy @@ -1,4 +1,4 @@ -grant codeBase "file:${es.path.home}/plugins/duniter4j-es-gchange/"{ +grant codeBase "file:${es.path.home}/plugins/duniter4j-es-subscription/"{ permission java.io.FilePermission "/etc/ld.so.conf", "read"; permission java.io.FilePermission "/etc/ld.so.conf.d/*.conf", "read"; permission java.io.FilePermission "/usr/local/lib/*", "read"; diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/PluginSettings.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/PluginSettings.java index 00601581814e13aeab27fcdb714404e86418a8f7..e640a389057facdda36a00115d2cbe8fbc794f7a 100644 --- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/PluginSettings.java +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/PluginSettings.java @@ -212,8 +212,17 @@ public class PluginSettings extends AbstractLifecycleComponent { return this.nodePubkey; } + public String getCesiumUrl() { + return this.settings.get("duniter.share.cesium.url", "https://g1.duniter.fr"); + } + public String getShareSiteName() { + return this.settings.get("duniter.user.share.site.name", "Cesium"); + } + public String getBaseUrl() { + return settings.get("duniter.share.base.url"); + } /* -- protected methods -- */ diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/Attachment.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/Attachment.java new file mode 100644 index 0000000000000000000000000000000000000000..3073c805f247a62e2eb6a0c1c8d2f62cda28178b --- /dev/null +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/Attachment.java @@ -0,0 +1,63 @@ +package org.duniter.elasticsearch.user.model; + +/* + * #%L + * Duniter4j :: Core Client API + * %% + * Copyright (C) 2014 - 2016 EIS + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + * #L% + */ + +import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonSetter; +import org.duniter.core.client.model.elasticsearch.Record; + +/** + * Created by blavenie on 01/03/16. + */ +public class Attachment extends Record { + + public static final String JSON_PROPERTY_CONTENT_TYPE = "_content_type"; + public static final String JSON_PROPERTY_CONTENT = "_content"; + + public static final String PROPERTY_CONTENT_TYPE = "contentType"; + public static final String PROPERTY_CONTENT = "content"; + + private String contentType; + + private String content; + + @JsonSetter(JSON_PROPERTY_CONTENT_TYPE) + public void setContentType(String contentType) { + this.contentType = contentType; + } + + @JsonGetter(JSON_PROPERTY_CONTENT_TYPE) + public String getContentType() { + return contentType; + } + + @JsonGetter(JSON_PROPERTY_CONTENT) + public String getContent() { + return content; + } + + @JsonSetter(JSON_PROPERTY_CONTENT) + public void setContent(String content) { + this.content = content; + } +} diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/UserProfile.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/UserProfile.java index 6ef6ecb0cc217f821fb3399e98370fbc4f8f8371..99c94b55a8ae38bad94d70b3ec0ea852565ec625 100644 --- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/UserProfile.java +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/model/UserProfile.java @@ -43,6 +43,7 @@ public class UserProfile extends Record { private String locale; private String address; private String city; + private Attachment avatar; public String getTitle() { return title; @@ -91,4 +92,12 @@ public class UserProfile extends Record { public void setCity(String city) { this.city = city; } + + public Attachment getAvatar() { + return avatar; + } + + public void setAvatar(Attachment avatar) { + this.avatar = avatar; + } } diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/RestModule.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/RestModule.java index 1422b77c0aac986165ae788fa60932df524ed010..fd91b23d0607055b152d9848d1e520c408abadba 100644 --- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/RestModule.java +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/RestModule.java @@ -50,6 +50,7 @@ public class RestModule extends AbstractModule implements Module { bind(RestUserEventMarkAsReadAction.class).asEagerSingleton(); bind(RestUserEventSearchAction.class).asEagerSingleton(); bind(RestUserAvatarAction.class).asEagerSingleton(); + bind(RestUserShareLinkAction.class).asEagerSingleton(); // Group bind(RestGroupIndexAction.class).asEagerSingleton(); @@ -76,6 +77,7 @@ public class RestModule extends AbstractModule implements Module { bind(RestPageCommentUpdateAction.class).asEagerSingleton(); bind(RestPageCategoryAction.class).asEagerSingleton(); bind(RestPageImageAction.class).asEagerSingleton(); + bind(RestPageShareLinkAction.class).asEagerSingleton(); // Mixed search bind(RestMixedSearchAction.class).asEagerSingleton(); diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/page/RestPageShareLinkAction.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/page/RestPageShareLinkAction.java new file mode 100644 index 0000000000000000000000000000000000000000..ecd1c817499ab22f60f370ff4ba7e231ba7da755 --- /dev/null +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/page/RestPageShareLinkAction.java @@ -0,0 +1,108 @@ +package org.duniter.elasticsearch.user.rest.page; + +import com.google.common.html.HtmlEscapers; +import org.duniter.core.exception.BusinessException; +import org.duniter.core.exception.TechnicalException; +import org.duniter.core.util.StringUtils; +import org.duniter.elasticsearch.exception.DuniterElasticsearchException; +import org.duniter.elasticsearch.rest.attachment.RestImageAttachmentAction; +import org.duniter.elasticsearch.rest.share.AbstractRestShareLinkAction; +import org.duniter.elasticsearch.user.PluginSettings; +import org.duniter.elasticsearch.user.dao.page.PageIndexDao; +import org.duniter.elasticsearch.user.dao.page.PageRecordDao; +import org.duniter.elasticsearch.user.model.UserProfile; +import org.duniter.elasticsearch.user.model.page.RegistryRecord; +import org.duniter.elasticsearch.user.service.PageService; +import org.duniter.elasticsearch.user.service.UserService; +import org.duniter.elasticsearch.util.opengraph.OGData; +import org.elasticsearch.client.Client; +import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.rest.RestController; +import org.nuiton.i18n.I18n; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Locale; + +public class RestPageShareLinkAction extends AbstractRestShareLinkAction { + + @Inject + public RestPageShareLinkAction(final Settings settings, final RestController controller, final Client client, + final PluginSettings pluginSettings, + final PageService service) { + super(settings, controller, client, PageIndexDao.INDEX, PageRecordDao.TYPE, + createResolver(pluginSettings, service)); + } + + protected static OGDataResolver createResolver( + final PluginSettings pluginSettings, + final PageService service) throws DuniterElasticsearchException, BusinessException { + + return (id) -> { + try { + RegistryRecord record = service.getPageForSharing(id); + + OGData data = new OGData(); + + if (record != null) { + + // og:title + if (StringUtils.isNotBlank(record.getTitle())) { + data.title = record.getTitle(); + } + else { + data.title = pluginSettings.getShareSiteName(); + } + + // og:description + data.description = HtmlEscapers.htmlEscaper().escape(record.getDescription()); + + // og:image + if (record.getThumbnail() != null && StringUtils.isNotBlank(record.getThumbnail().get("_content_type"))) { + String baseUrl = pluginSettings.getBaseUrl(); + data.image = StringUtils.isBlank(baseUrl) ? "" : baseUrl; + data.image += RestImageAttachmentAction.computeImageUrl(PageIndexDao.INDEX, PageRecordDao.TYPE, id, RegistryRecord.PROPERTY_THUMBNAIL, record.getThumbnail().get("_content_type")); + } + + // og:url + data.url = String.format("%s/#/app/page/view/%s/%s", + pluginSettings.getCesiumUrl(), + id, + URLEncoder.encode(record.getTitle(), "UTF-8")); + } + else { + + // og:title + data.title = pluginSettings.getShareSiteName(); + + // og:description + data.description = I18n.t("duniter.user.share.description"); + + // og:url + data.url = String.format("%s/#/app/page/view/%s/%s", + pluginSettings.getCesiumUrl(), + id, + ""); + } + + // og:type + data.type = "website"; + + // og:site_name + data.siteName = pluginSettings.getShareSiteName(); + + // default og:image + if (StringUtils.isBlank(data.image)) { + data.image = pluginSettings.getCesiumUrl() + "/img/logo_128px.png"; + data.imageType = "image/png"; + } + + return data; + } + catch(UnsupportedEncodingException e) { + throw new TechnicalException(e); + } + }; + } +} diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/user/RestUserShareLinkAction.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/user/RestUserShareLinkAction.java new file mode 100644 index 0000000000000000000000000000000000000000..540e6e4e0fcdf07c324b0b6a248d078763e7b2c2 --- /dev/null +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/rest/user/RestUserShareLinkAction.java @@ -0,0 +1,130 @@ +package org.duniter.elasticsearch.user.rest.user; + +import com.google.common.collect.Maps; +import com.google.common.html.HtmlEscapers; +import org.duniter.core.exception.BusinessException; +import org.duniter.core.exception.TechnicalException; +import org.duniter.core.util.StringUtils; +import org.duniter.elasticsearch.exception.DuniterElasticsearchException; +import org.duniter.elasticsearch.rest.attachment.RestImageAttachmentAction; +import org.duniter.elasticsearch.rest.share.AbstractRestShareLinkAction; +import org.duniter.elasticsearch.user.PluginSettings; +import org.duniter.elasticsearch.user.model.UserProfile; +import org.duniter.elasticsearch.user.service.UserService; +import org.duniter.elasticsearch.util.opengraph.OGData; +import org.elasticsearch.client.Client; +import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.rest.RestController; +import org.nuiton.i18n.I18n; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Locale; + +public class RestUserShareLinkAction extends AbstractRestShareLinkAction { + + @Inject + public RestUserShareLinkAction(final Settings settings, final RestController controller, final Client client, + final PluginSettings pluginSettings, + final UserService userService) { + super(settings, controller, client, UserService.INDEX, UserService.PROFILE_TYPE, + createResolver(pluginSettings, userService)); + + if (StringUtils.isBlank(pluginSettings.getBaseUrl())) { + log.warn(I18n.t("duniter4j.es.share.error.noBaseUrl", "duniter.share.base.url")); + } + } + + protected static AbstractRestShareLinkAction.OGDataResolver createResolver( + final PluginSettings pluginSettings, + final UserService userService) throws DuniterElasticsearchException, BusinessException { + + return (id) -> { + try { + UserProfile profile = userService.getUserProfileForSharing(id); + + OGData data = new OGData(); + + if (profile != null) { + + // og:locale + Locale locale; + if (StringUtils.isNotBlank(profile.getLocale())) { + locale = new Locale(profile.getLocale()); + data.locale = profile.getLocale(); + } + else { + locale = I18n.getDefaultLocale(); + } + + String pubkey = I18n.l(locale, "duniter.user.share.pubkey", id); + + // og:title + if (StringUtils.isNotBlank(profile.getTitle())) { + data.title = profile.getTitle(); + data.description = pubkey; + } + else { + data.title = pubkey; + data.description = ""; + } + + // og:description + if (StringUtils.isNotBlank(data.description)) data.description += " | "; + if (StringUtils.isNotBlank(profile.getDescription())) { + data.description += HtmlEscapers.htmlEscaper().escape(profile.getDescription()); + } + else { + data.description += I18n.l(locale, "duniter.user.share.description"); + } + + // og:image + if (profile.getAvatar() != null && StringUtils.isNotBlank(profile.getAvatar().getContentType())) { + String baseUrl = pluginSettings.getBaseUrl(); + data.image = StringUtils.isBlank(baseUrl) ? "" : baseUrl; + data.image += RestImageAttachmentAction.computeImageUrl(UserService.INDEX, UserService.PROFILE_TYPE, id, UserProfile.PROPERTY_AVATAR, profile.getAvatar().getContentType()); + } + + // og:url + data.url = String.format("%s/#/app/wot/%s/%s", + pluginSettings.getCesiumUrl(), + id, + URLEncoder.encode(profile.getTitle(), "UTF-8")); + } + else { + + // og:title + String pubkey = I18n.t("duniter.user.share.pubkey", id); + data.title = pubkey; + + // og:description + data.description = I18n.t("duniter.user.share.description"); + + // og:url + data.url = String.format("%s/#/app/wot/%s/%s", + pluginSettings.getCesiumUrl(), + id, + ""); + } + + // og:type + data.type = "website"; + + // og:site_name + data.siteName = pluginSettings.getShareSiteName(); + + // default og:image + if (StringUtils.isBlank(data.image)) { + data.image = pluginSettings.getCesiumUrl() + "/img/logo_128px.png"; + data.imageType = "image/png"; + } + + return data; + } + catch(UnsupportedEncodingException e) { + throw new TechnicalException(e); + } + }; + } +} diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/PageService.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/PageService.java index 881fd85ef293b7d62b20afade1c87d375c4d5cd0..f4b4429e5af3cca16913fdff7eaf0fc9742d8c80 100644 --- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/PageService.java +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/PageService.java @@ -32,6 +32,8 @@ import org.duniter.elasticsearch.user.PluginSettings; import org.duniter.elasticsearch.user.dao.page.PageCommentDao; import org.duniter.elasticsearch.user.dao.page.PageIndexDao; import org.duniter.elasticsearch.user.dao.page.PageRecordDao; +import org.duniter.elasticsearch.user.model.UserProfile; +import org.duniter.elasticsearch.user.model.page.RegistryRecord; import org.elasticsearch.common.inject.Inject; /** @@ -138,6 +140,13 @@ public class PageService extends AbstractService { commentDao.update(id, json); } + public RegistryRecord getPageForSharing(String id) { + + return client.getSourceByIdOrNull(recordDao.getIndex(), recordDao.getType(), id, RegistryRecord.class, + RegistryRecord.PROPERTY_TITLE, + RegistryRecord.PROPERTY_DESCRIPTION, + RegistryRecord.PROPERTY_THUMBNAIL); + } /* -- Internal methods -- */ diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserService.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserService.java index 745f5b828e6eb0bfe35efa97b875556329b5c4d9..2d080a88ba9d1309ec607cb8aa9a5345c5103003 100644 --- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserService.java +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserService.java @@ -24,19 +24,26 @@ package org.duniter.elasticsearch.user.service; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; import org.duniter.core.util.Preconditions; import org.apache.commons.collections4.MapUtils; import org.duniter.core.client.model.ModelUtils; -import org.duniter.core.client.model.elasticsearch.UserProfile; +import org.duniter.elasticsearch.user.model.Attachment; +import org.duniter.elasticsearch.user.model.UserProfile; import org.duniter.core.service.CryptoService; import org.duniter.elasticsearch.client.Duniter4jClient; +import org.duniter.elasticsearch.rest.attachment.RestImageAttachmentAction; +import org.duniter.elasticsearch.rest.share.AbstractRestShareLinkAction; import org.duniter.elasticsearch.user.PluginSettings; import org.duniter.elasticsearch.exception.AccessDeniedException; import org.duniter.elasticsearch.service.AbstractService; import org.duniter.elasticsearch.user.dao.profile.UserIndexDao; import org.duniter.elasticsearch.user.dao.profile.UserProfileDao; import org.duniter.elasticsearch.user.dao.profile.UserSettingsDao; +import org.duniter.elasticsearch.util.opengraph.OGData; import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.rest.BytesRestResponse; +import org.elasticsearch.rest.RestStatus; import java.util.HashMap; import java.util.Map; @@ -226,6 +233,15 @@ public class UserService extends AbstractService { return sb.substring(separator.length()); } + public UserProfile getUserProfileForSharing(String id) { + + return client.getSourceByIdOrNull(INDEX, PROFILE_TYPE, id, UserProfile.class, + UserProfile.PROPERTY_TITLE, + UserProfile.PROPERTY_DESCRIPTION, + UserProfile.PROPERTY_LOCALE, + UserProfile.PROPERTY_AVATAR); + } + /* -- Internal methods -- */ } diff --git a/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_en_GB.properties b/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_en_GB.properties index 98d218d1ac2674b2a99cc8e0d673c1eb85d6576e..3c47a593117794059ed2628a702289ef4d3798b0 100644 --- a/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_en_GB.properties +++ b/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_en_GB.properties @@ -15,4 +15,7 @@ duniter.user.event.NODE_BMA_UP=Duniter node [%1$s\:%2$s] is UP again. duniter.user.event.NODE_STARTED=Your node ES API [%1$s] is UP. duniter.user.event.TX_RECEIVED=You received a payment from %2$s. duniter.user.event.TX_SENT=Your payment to %2$s was executed. +duniter.user.share.description=Follow your "libre money" wallets easily +duniter.user.share.pubkey=Public key\: %1$s +duniter4j.es.share.error.noBaseUrl=Image path are relative for share links (og\:image). /\!\\ Set [%s] in the configuration (recommended). duniter4j.ws.user.open=User [%1$s] connecting with id [%2$s] with locale [%3$s] diff --git a/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties b/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties index e4e31362232b4af585877a5b90a3541bf51c8da1..ec9ace345c37859ec4eebeece40f906bd7d5233d 100644 --- a/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties +++ b/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties @@ -15,4 +15,7 @@ duniter.user.event.NODE_BMA_UP=Noeud Duniter [%1$s\:%2$s] à nouveau accessible. duniter.user.event.NODE_STARTED=Noeud ES API [%1$s] est démarré. duniter.user.event.TX_RECEIVED=Vous avez recu un paiement de %2$s. duniter.user.event.TX_SENT=Votre paiement à %2$s a bien été executé. +duniter.user.share.description=Suivez vos comptes de monnaie libre en toute simplicité \! +duniter.user.share.pubkey=Clé publique \: %1$s +duniter4j.es.share.error.noBaseUrl=Chemins relatif pour les images, dans les partages (og\:image). /\!\\ Renseignez [%s] dans la configuration (conseillé). duniter4j.ws.user.open=Utilisateur [%1$s] connecté id\=[%2$s] sur la locale [%3$s] diff --git a/pom.xml b/pom.xml index ea42a4859c7081124d9c4a627b95c62efbdd3942..a58713254a8ae40c7e5eecc5a9478632480fd1dd 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,8 @@ 1.7.5 22.0 2.0.2 - 0.5.0_blavenie - 2.1.0 + 0.6.0_PR64 + 2.1.7 1.4.0 2.4.6 4.2.0 diff --git a/src/scripts/start-es-node.sh b/src/scripts/start-es-node.sh new file mode 100755 index 0000000000000000000000000000000000000000..a9be23c2a5700cafb7bcfa08b37ab480d64a0ea4 --- /dev/null +++ b/src/scripts/start-es-node.sh @@ -0,0 +1,16 @@ +#!/bin/bash + + +PID=`ps -efl | grep duniter4j-es | grep g1/lib | awk '/^([0-9]+) ([^\s]) ([a-zA-Z0-9]+) ([0-9]+).*/ {printf "%s", $4}'` + +if [ "$PID" != "" ]; +then + echo "Error: ES node already started!" + exit -1 +else + cd /opt/duniter4j-es-g1/bin + ./elasticsearch -d + echo "ES node started !" + echo "...to follow log: tail -f /opt/duniter4j-es-g1/logs/g1-es-data.log" +fi + diff --git a/src/scripts/stop-es-nodes.sh b/src/scripts/stop-es-nodes.sh new file mode 100755 index 0000000000000000000000000000000000000000..8181a733c99af4acddd1e759dcb3b3effc6cfcca --- /dev/null +++ b/src/scripts/stop-es-nodes.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Get ES PID +PID=`ps -efl | grep duniter4j-es | grep lib | awk '{printf "%s", $4}'` + +if [ "$PID" != "" ]; +then + echo "Stopping ES node running on PID $PID..." + sudo kill -15 $PID + + sleep 5s + + # Check if still alive + PID=`ps -efl | grep duniter4j-es | grep g1/lib | awk '{printf "%s", $4}'` + if [ "$PID" != "" ]; + then + sleep 10s + fi + + PID=`ps -efl | grep duniter4j-es | grep g1/lib | awk '{printf "%s", $4}'` + if [ "$PID" != "" ]; + then + echo "Error: Unable to stop ES node !" + exit -1 + else + echo "ES node stopped" + fi + +else + echo "ES node not running!" +fi + diff --git a/src/scripts/update-es-node.sh b/src/scripts/update-es-node.sh new file mode 100755 index 0000000000000000000000000000000000000000..28702aadeaff634210f4a1ecbd87ac75b1b60860 --- /dev/null +++ b/src/scripts/update-es-node.sh @@ -0,0 +1,90 @@ +#!/bin/bash + +VERSION=$1 +OLD_VERSION=$2 + +if [ "${VERSION}" == "" ]; then + echo "ERROR: Missing version argument !" + echo " " + echo "usage: sudo ./update-es.sh []" + exit +fi +if [ "${OLD_VERSION}" == "" ]; then + OLD_VERSION=`ps -efl | grep duniter4j-es | grep g1/lib | sed -r 's/.*duniter4j-es-([0-9.]+)-g1.*/\1/g'` + if [ "${OLD_VERSION}" == "" ]; then + echo "Error: unable to known previous version" + exit + fi +fi + +READLINK=`which readlink` +if [ -z "$READLINK" ]; then + message "Required tool 'readlink' is missing. Please install before launch \"$0\" file." + exit 1 +fi + +# ------------------------------------------------------------------ +# Ensure BASEDIR points to the directory where the soft is installed. +# ------------------------------------------------------------------ +SCRIPT_LOCATION=$0 +if [ -x "$READLINK" ]; then + while [ -L "$SCRIPT_LOCATION" ]; do + SCRIPT_LOCATION=`"$READLINK" -e "$SCRIPT_LOCATION"` + done +fi + +export BASEDIR=`dirname "$SCRIPT_LOCATION"` +cd $BASEDIR + +echo "--- Downloading duniter4j-es-standalone v$VERSION... ----------------------" + +if [ -f "downloads/duniter4j-es-${VERSION}-standalone.zip" ]; then + echo "...removing file, as it already exists in ./downloads/duniter4j-es-${VERSION}-standalone.zip" + rm ./downloads/duniter4j-es-${VERSION}-standalone.zip +fi + +if [ ! -e "downloads" ]; then + mkdir downloads +fi + +cd downloads +wget -kL https://github.com/duniter/duniter4j/releases/download/duniter4j-${VERSION}/duniter4j-es-${VERSION}-standalone.zip +cd .. + +if [ -f "downloads/duniter4j-es-${VERSION}-standalone.zip" ]; then + echo "" +else + echo "Error: unable to dowlonad this version!" + exit -1 +fi + +echo "--- Installating duniter4j-es v$VERSION... ---------------------" +if [ -d "/opt/duniter4j-es-${VERSION}-g1" ]; then + echo "Error: Already installed in /opt/duniter4j-es-${VERSION}-g1 !" + exit -1 +fi + +unzip -o ./downloads/duniter4j-es-${VERSION}-standalone.zip +mv duniter4j-es-${VERSION} duniter4j-es-${VERSION}-g1 +sudo mv duniter4j-es-${VERSION}-g1 /opt/ +sudo rm /opt/duniter4j-es-g1 +sudo ln -s /opt/duniter4j-es-${VERSION}-g1 /opt/duniter4j-es-g1 + +mkdir /opt/duniter4j-es-${VERSION}-g1/data +mv /opt/duniter4j-es-${VERSION}-g1/config/elasticsearch.yml /opt/duniter4j-es-${VERSION}-g1/config/elasticsearch.yml.ori + +./stop-es-nodes.sh + +if [ "$OLD_VERSION" != "$VERSION" ]; +then + echo "--- Restoring files (data+config) from previous version $OLD_VERSION... ---------------------" + tar -cvf /opt/duniter4j-es-${OLD_VERSION}-g1/data/save.tar.gz /opt/duniter4j-es-${OLD_VERSION}-g1/data/g1-* + mv /opt/duniter4j-es-${OLD_VERSION}-g1/data/g1-* /opt/duniter4j-es-${VERSION}-g1/data + cp /opt/duniter4j-es-${OLD_VERSION}-g1/config/elasticsearch.yml /opt/duniter4j-es-${VERSION}-g1/config +fi + +#./start-es-nodes.sh + +echo "--- Successfully installed duniter4j-es v$VERSION ! -------------" +echo "" +