Skip to content

Commit

Permalink
Merge branch 'feature/distro-pkgs' into develop, closes #89
Browse files Browse the repository at this point in the history
  • Loading branch information
jhillyerd committed Mar 26, 2018
2 parents 7ab9ea9 + 393a5b8 commit 64ecd81
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 228 deletions.
27 changes: 24 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
project_name: inbucket

release:
github:
owner: jhillyerd
name: inbucket
name_template: '{{.Tag}}'

brew:
commit_author:
name: goreleaserbot
email: goreleaser@carlosbecker.com
install: bin.install ""

builds:
- binary: inbucket
goos:
Expand All @@ -22,7 +25,7 @@ builds:
- "6"
main: ./cmd/inbucket
ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
- binary: client
- binary: inbucket-client
goos:
- darwin
- freebsd
Expand All @@ -34,6 +37,7 @@ builds:
- "6"
main: ./cmd/client
ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}

archive:
format: tar.gz
wrap_in_directory: true
Expand All @@ -48,12 +52,29 @@ archive:
- CHANGELOG*
- etc/**/*
- ui/**/*
fpm:
bindir: /usr/local/bin

nfpm:
vendor: inbucket.org
homepage: https://www.inbucket.org/
maintainer: github@hillyerd.com
description: All-in-one disposable webmail service.
license: MIT
formats:
- deb
- rpm
files:
"ui/**/*": "/usr/local/share/inbucket/ui"
config_files:
"etc/linux/inbucket.service": "/lib/systemd/system/inbucket.service"
"ui/greeting.html": "/etc/inbucket/greeting.html"

snapshot:
name_template: SNAPSHOT-{{ .Commit }}

checksum:
name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'

dist: dist

sign:
artifacts: none
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Storage type is now displayed on Status page.
- Store size is now calculated during retention scan and displayed on the Status
page.
- Debian `.deb` package generation to release process.
- RedHat `.rpm` package generation to release process.

### Changed
- Massive refactor of back-end code. Inbucket should now be both easier and
Expand Down
33 changes: 33 additions & 0 deletions etc/linux/inbucket.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[Unit]
Description=Inbucket Disposable Email Service
After=network.target

[Service]
Type=simple
User=daemon
Group=daemon
PermissionsStartOnly=true

Environment=INBUCKET_LOGLEVEL=WARN
Environment=INBUCKET_SMTP_ADDR=0.0.0.0:2500
Environment=INBUCKET_POP3_ADDR=0.0.0.0:1100
Environment=INBUCKET_WEB_ADDR=0.0.0.0:9000
Environment=INBUCKET_WEB_UIDIR=/usr/local/share/inbucket/ui
Environment=INBUCKET_WEB_GREETINGFILE=/etc/inbucket/greeting.html
Environment=INBUCKET_STORAGE_TYPE=file
Environment=INBUCKET_STORAGE_PARAMS=path:/var/local/inbucket

# Uncomment line below to use low numbered ports
#ExecStartPre=/sbin/setcap 'cap_net_bind_service=+ep' /usr/local/bin/inbucket

ExecStartPre=/bin/mkdir -p /var/local/inbucket
ExecStartPre=/bin/chown daemon:daemon /var/local/inbucket

ExecStart=/usr/local/bin/inbucket

# Give SMTP connections time to drain
TimeoutStopSec=20
KillMode=mixed

[Install]
WantedBy=multi-user.target
3 changes: 0 additions & 3 deletions etc/redhat/README

This file was deleted.

17 changes: 0 additions & 17 deletions etc/redhat/httpd-vhost.conf

This file was deleted.

117 changes: 0 additions & 117 deletions etc/redhat/inbucket-init.sh

This file was deleted.

8 changes: 0 additions & 8 deletions etc/redhat/inbucket.logrotate

This file was deleted.

20 changes: 0 additions & 20 deletions etc/redhat/inbucket.service

This file was deleted.

3 changes: 0 additions & 3 deletions etc/ubuntu/README

This file was deleted.

29 changes: 0 additions & 29 deletions etc/ubuntu/inbucket-upstart.conf

This file was deleted.

8 changes: 0 additions & 8 deletions etc/ubuntu/inbucket.logrotate

This file was deleted.

20 changes: 0 additions & 20 deletions etc/ubuntu/inbucket.service

This file was deleted.

0 comments on commit 64ecd81

Please sign in to comment.