Merge pull request #5 from Alexj12/add-ui-path-option

Add ui path option
r8 · Sep 23, 2020 · ea8aa96 · ea8aa96
2 parents 4022494 + 8b640be
commit ea8aa96
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ This cookbook contains the following attributes:
 | ['mailhog']['api']['port']                       | Integer | 8025                                                              | Port for HTTP API server to bind to                                          |
 | ['mailhog']['ui']['ip']                          | String  | 0.0.0.0                                                           | Interface for HTTP UI server to bind to                                      |
 | ['mailhog']['ui']['port']                        | Integer | 8025                                                              | Port for HTTP UI server to bind to                                           |
+| ['mailhog']['ui']['web_path']                    | String  | ''                                                                | WebPath under which the ui is served (without leading or trailing slahes), e.g. 'mailhog'  |
 | ['mailhog']['cors-origin']                       | String  | nil                                                               | If set, a Access-Control-Allow-Origin header is returned for API endpoints   |
 | ['mailhog']['hostname']                          | String  | mailhog.example                                                   | Hostname to use for EHLO/HELO and message IDs                                |
 | ['mailhog']['storage']                           | String  | memory                                                            | Set message storage: memory / mongodb / maildir                              |

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -47,6 +47,7 @@
 default['mailhog']['api']['port'] = 8025
 default['mailhog']['ui']['ip'] = '0.0.0.0'
 default['mailhog']['ui']['port'] = 8025
+default['mailhog']['ui']['web_path'] = ''
 
 default['mailhog']['cors-origin'] = nil
 default['mailhog']['hostname'] = 'mailhog.example'

diff --git a/metadata.rb b/metadata.rb
@@ -3,7 +3,7 @@
 maintainer_email 'r8@r8.com.ua'
 license          'MIT'
 description      'Installs/Configures mailhog'
-version          '0.2.0'
+version          '0.2.1'
 
 depends          'runit', '= 1.7.4'
 

diff --git a/recipes/binary.rb b/recipes/binary.rb
@@ -52,6 +52,7 @@
     :smtp_outgoing => node['mailhog']['smtp']['outgoing'],
     :ui_ip => node['mailhog']['ui']['ip'],
     :ui_port => node['mailhog']['ui']['port'],
+    :ui_web_path => node['mailhog']['ui']['web_path'],
     :api_ip => node['mailhog']['api']['ip'],
     :api_port => node['mailhog']['api']['port'],
     :cors_origin => node['mailhog']['cors-origin'],

diff --git a/templates/default/sv-mailhog-run.erb b/templates/default/sv-mailhog-run.erb
@@ -4,6 +4,7 @@ exec /usr/bin/env MailHog \
   -smtp-bind-addr=<%= @options[:smtp_ip] %>:<%= @options[:smtp_port] %> \
   -outgoing-smtp=<%= @options[:smtp_outgoing] %> \
   -ui-bind-addr=<%= @options[:ui_ip] %>:<%= @options[:ui_port] %> \
+  -ui-web-path=<%= @options[:ui_web_path] %> \
   -api-bind-addr=<%= @options[:api_ip] %>:<%= @options[:api_port] %> \
   -cors-origin=<%= @options[:cors_origin] %> \
   -hostname=<%= @options[:hostname] %> \