fulmar 1.5.1 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6bebeb9c011e4edea9e286d3c043eda55450a8b0
4
- data.tar.gz: ba575c2d25770c7bc6cba9a8c15f109ee0882e53
3
+ metadata.gz: 94c412b27a13af7d2c5954307361b2afedb2a065
4
+ data.tar.gz: b1630fd62123dfaeab9167648a07e3af90f8f840
5
5
  SHA512:
6
- metadata.gz: 50d1eda6ab45889dfb9339c150e341ab7da250fc3d9537c5ccddb21e2e9336348cc85fd0c7bf7e5c79edee432dbe120804066aca15c4333f26f64a8abbde1fae
7
- data.tar.gz: ace82db763333502091badee3701645ee686fefa59987dc2b87a84f3a431e316faf4e979155bd1297ca193e18386935723c8884896d84822da0314023b097749
6
+ metadata.gz: 30f6993150e391316a3a706b45237f271adc249fee20d94fc5fbe44e43edd6f473b9c813dcbd4d9fb651467fe8a49231fd3836e19100c515d208cad89b6e72b7
7
+ data.tar.gz: 7a94a81d220d6c3536d98291bfa3cdd15af8c0aff7ea3a7db79c612509ce5c6cbfc60717d8dd7b387f46c21ce6ee5648b8ac5de7100ee2496752823a44508a43
@@ -6,7 +6,7 @@ module Fulmar
6
6
  module VhostHelper
7
7
  def vhost_name
8
8
  branch = git.current_branch
9
- match = branch.match(/f\d+_([a-zA-Z0-9]+)/)
9
+ match = branch.match(/f\d+_([a-zA-Z0-9\_\-]+)/)
10
10
  if match
11
11
  match[1]
12
12
  else
@@ -49,6 +49,7 @@ namespace :vhost do
49
49
  task (vhost_count > 1 ? "list:#{env}" : 'list') do
50
50
  configuration.environment = env
51
51
  configuration.target = target
52
+ configuration.merge(VHOST_DEFAULT_CONFIG)
52
53
 
53
54
  remote_shell.run 'ls -1'
54
55
  remote_shell.last_output.each do |line|
@@ -64,9 +65,11 @@ namespace :vhost do
64
65
  task (vhost_count > 1 ? "delete:#{env}" : 'delete'), [:name] do |_t, argv|
65
66
  configuration.environment = env
66
67
  configuration.target = target
68
+ configuration.merge(VHOST_DEFAULT_CONFIG)
67
69
 
68
70
  remote_shell.run [
69
71
  "rm auto_vhost_#{argv[:name]}.conf",
72
+ "rm #{configuration[:sites_enabled_dir]}/auto_vhost_#{argv[:name]}.conf",
70
73
  "service #{configuration[:webserver] || 'nginx'} reload"
71
74
  ]
72
75
  end
@@ -1,4 +1,4 @@
1
1
  # Provides a global version number
2
2
  module Fulmar
3
- VERSION = '1.5.1'
3
+ VERSION = '1.5.2'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fulmar
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.1
4
+ version: 1.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Siegl