Add ubuntu/bionic packaging files

2020-12-22 15:13:00 +01:00
10 changed files with 20 additions and 35 deletions
--- a/11
+++ b/11
@ -16,16 +16,17 @@ docker-image:
 docker-run:
 	docker run \
 		--rm -it \
-		-p 3000:3000 \
+		-p 8080:8080 \
+		-p 2525:2525 \
 		--tmpfs /app/data \
 		fake-sms:latest

 docker-release:
-	docker tag fake-sms:latest cadoles/fake-sms:latest
-	docker tag fake-sms:latest cadoles/fake-sms:$(DOCKER_DATE_TAG)
+	docker tag fake-sms:latest bornholm/fake-sms:latest
+	docker tag fake-sms:latest bornholm/fake-sms:$(DOCKER_DATE_TAG)
 	docker login
-	docker push cadoles/fake-sms:latest
-	docker push cadoles/fake-sms:$(DOCKER_DATE_TAG)
+	docker push bornholm/fake-sms:latest
+	docker push bornholm/fake-sms:$(DOCKER_DATE_TAG)

 test:
 	go test -v -race ./...
--- a/README.md
+++ b/README.md
@ -7,10 +7,10 @@ Serveur d'envoi de SMS factice pour le développement avec interface web.
 ### Avec Docker

 ```bash
-docker run -it --rm -p 3000:3000 cadoles/fake-sms
+docker run -it --rm -p 3000:3000 -p 2525:2525 bornholm/fake-sms
 ```

-L'interface Web sera accessible à l'adresse http://localhost:3000/.
+L'interface Web sera accessible à l'adresse http://localhost:8080/.

 Voir la section "[Variables d'environnement](#variables-denvironnement)" pour voir comment personnaliser la configuration du service.

@ -20,6 +20,8 @@ Voir la section "[Variables d'environnement](#variables-denvironnement)" pour vo

 ## Configuration

+## Fichier de configuration
+
 Le fichier de configuration de FakeSMTP est au format [YAML](https://yaml.org/).

 Voici la structure du fichier par défaut:
--- a/cmd/fake-sms/template/blocks/base.html.tmpl
+++ b/cmd/fake-sms/template/blocks/base.html.tmpl
@ -6,10 +6,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <title>{{block "title" . -}}{{- end}}</title>
    {{- block "head_style" . -}}
-    <link rel="stylesheet" href="{{ .BaseURL }}/css/main.css" />
+    <link rel="stylesheet" href="/css/main.css" />
    {{end}}
    {{- block "head_script" . -}}
-      <script type="text/javascript" src="{{ .BaseURL }}/main.js"></script>
+      <script type="text/javascript" src="/main.js"></script>
    {{end}}
  </head>
  <body>
--- a/cmd/fake-sms/template/blocks/header.html.tmpl
+++ b/cmd/fake-sms/template/blocks/header.html.tmpl
@ -2,7 +2,7 @@
 <div class="columns is-mobile">
  <div class="column is-narrow">
    <h1 class="is-size-3 title">
-      <a href="{{ .BaseURL }}/" rel="Inbox" class="has-text-grey-dark">
+      <a href="/" rel="Inbox" class="has-text-grey-dark">
      {{if or .Messages .SMS}}
        📳
      {{else}}
--- a/cmd/fake-sms/template/layouts/outbox.html.tmpl
+++ b/cmd/fake-sms/template/layouts/outbox.html.tmpl
@ -2,7 +2,7 @@
 {{define "header_buttons"}}
  <button 
    data-controller="restful" 
-    data-restful-endpoint="{{ .BaseURL }}/sms"
+    data-restful-endpoint="/sms"
    data-restful-method="DELETE"
    class="button is-danger">
    🗑️ Clear
@ -23,11 +23,10 @@
          </tr>
        </thead>
        <tbody>
-          {{ $baseURL := .BaseURL }}
          {{range .Messages}}
            <tr data-controller="inbox-entry"
              data-action="click->outbox-entry#onClick"
-              data-inbox-entry-link="{{ $baseURL }}/sms/{{ .ID }}">
+              data-inbox-entry-link="./sms/{{ .ID }}">
              <td class="sms-from">
                <span class="is-size-7">{{ .From }}</span>
              </td>
@ -39,7 +38,7 @@
              </td>
              <td class="sms-actions">
                <div class="buttons is-right">
-                  <a href="{{ $baseURL }}/sms/{{ .ID }}" class="button is-small is-link">👁️ See</a>
+                  <a href="./sms/{{ .ID }}" class="button is-small is-link">👁️ See</a>
                </div>
              </td>
            </tr>
--- a/cmd/fake-sms/template/layouts/sms.html.tmpl
+++ b/cmd/fake-sms/template/layouts/sms.html.tmpl
@ -2,9 +2,9 @@
 {{define "header_buttons"}}
  <button class="button is-danger"
    data-controller="restful" 
-    data-restful-endpoint="{{ .BaseURL }}/sms/{{ .SMS.ID }}"
+    data-restful-endpoint="./{{ .SMS.ID }}"
    data-restful-method="DELETE"
-    data-restful-redirect="{{ .BaseURL }}/">
+    data-restful-redirect="../">
    🗑️ Delete
  </button>
 {{end}}
--- a/debian/rules
+++ b/debian/rules
@ -44,7 +44,7 @@ override_dh_auto_install:

 	cp -r release/fake-sms-$(OS)-$(ARCH)/* debian/fake-sms/usr/share/fake-sms/
 	
-	mv debian/fake-sms/usr/share/fake-sms/bin/fake-sms debian/fake-sms/usr/bin/fake-sms
+	mv debian/fake-sms/usr/share/fake-sms/bin/fake-sms debian/fake-smtp/usr/bin/fake-sms
 	mv debian/fake-sms/usr/share/fake-sms/config.yml debian/fake-sms/etc/fake-sms/config.yml

 	install -d debian/fake-sms
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -20,7 +20,6 @@ type HTTPConfig struct {
 	Address     string `yaml:"address" env:"FAKESMS_HTTP_ADDRESS"`
 	TemplateDir string `yaml:"templateDir" env:"FAKESMS_HTTP_TEMPLATEDIR"`
 	PublicDir   string `yaml:"publicDir" env:"FAKESMS_HTTP_PUBLICDIR"`
-	BaseURL     string `yaml:"baseUrl" env:"FAKESMS_HTTP_BASEURL"`
 }

 type DataConfig struct {
--- a/internal/route/helper.go
+++ b/internal/route/helper.go
@ -5,11 +5,9 @@ import (
 	"strconv"
 	"time"

-	"forge.cadoles.com/Cadoles/fake-sms/internal/config"
 	"forge.cadoles.com/Cadoles/fake-sms/internal/query"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/middleware/container"
-	"gitlab.com/wpetit/goweb/service"
 	"gitlab.com/wpetit/goweb/service/template"
 )

@ -17,7 +15,6 @@ func extendTemplateData(w http.ResponseWriter, r *http.Request, data template.Da
 	ctn := container.Must(r.Context())
 	data, err := template.Extend(data,
 		template.WithBuildInfo(w, r, ctn),
-		withBaseURL(ctn),
 	)

 	if err != nil {
@ -27,19 +24,6 @@ func extendTemplateData(w http.ResponseWriter, r *http.Request, data template.Da
 	return data
 }

-func withBaseURL(ctn *service.Container) template.DataExtFunc {
-	return func(data template.Data) (template.Data, error) {
-		conf, err := config.From(ctn)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-
-		data["BaseURL"] = conf.HTTP.BaseURL
-
-		return data, nil
-	}
-}
-
 func createOutboxQueryFromRequest(r *http.Request) (*query.GetOutboxRequest, error) {
 	orderBy := r.URL.Query().Get("orderBy")
 	reverse := r.URL.Query().Get("reverse")
--- a/package-lock.json
+++ b/package-lock.json
@ -1,5 +1,5 @@
 {
-  "name": "fake-sms",
+  "name": "fake-smtp",
  "version": "0.0.0",
  "lockfileVersion": 1,
  "requires": true,