Skip to content

Commit 5a74ba6

Browse files
willaerkwillaerk
committed
Replace UiT CMS deployment execs by 'drush deploy'
1 parent bc9c54a commit 5a74ba6

File tree

2 files changed

+22
-83
lines changed

2 files changed

+22
-83
lines changed

‎manifests/uit/cms/deployment.pp‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,7 @@
66
Optional[String] $puppetdb_url = lookup('data::puppet::puppetdb::url', Optional[String], 'first', undef)
77
) inherits ::profiles {
88

9-
$basedir = '/var/www/uit-cms'
10-
$exec_default_attributes = {
11-
cwd => $basedir,
12-
path => ['/usr/local/bin', '/usr/bin', '/bin', "${basedir}/vendor/bin"],
13-
environment => ['HOME=/'],
14-
user => 'www-data',
15-
refreshonly => true,
16-
subscribe => [Package['uit-cms'], File['uit-cms-settings'], File['uit-cms-drush-config']]
17-
}
9+
$basedir = '/var/www/uit-cms'
1810

1911
realize Group['www-data']
2012
realize User['www-data']
@@ -47,28 +39,16 @@
4739
notify => Service['uit-cms']
4840
}
4941

50-
exec { 'uit-cms-cache-rebuild pre':
51-
command => 'drush cache:rebuild',
52-
require => User['www-data'],
53-
* => $exec_default_attributes
54-
}
55-
56-
exec { 'uit-cms-updatedb':
57-
command => 'drush updatedb -y',
58-
require => [User['www-data'], Exec['uit-cms-cache-rebuild pre']],
59-
* => $exec_default_attributes
60-
}
61-
62-
exec { 'uit-cms-config-import':
63-
command => 'drush config:import -y',
64-
require => [User['www-data'], Exec['uit-cms-updatedb']],
65-
* => $exec_default_attributes
66-
}
67-
68-
exec { 'uit-cms-cache-rebuild post':
69-
command => 'drush cache:rebuild',
70-
require => [User['www-data'], Exec['uit-cms-config-import']],
71-
* => $exec_default_attributes
42+
exec { 'uit-cms-drush-deploy':
43+
command => 'drush deploy -v -y',
44+
cwd => $basedir,
45+
path => ['/usr/local/bin', '/usr/bin', '/bin', "${basedir}/vendor/bin"],
46+
environment => ['HOME=/'],
47+
user => 'www-data',
48+
refreshonly => true,
49+
logoutput => 'on_failure',
50+
require => User['www-data'],
51+
subscribe => [Package['uit-cms'], File['uit-cms-settings'], File['uit-cms-drush-config']]
7252
}
7353

7454
cron { 'uit-cms-core-cron':
@@ -77,7 +57,7 @@
7757
user => 'www-data',
7858
hour => '*',
7959
minute => ['0', '30'],
80-
require => [User['www-data'], Exec['uit-cms-cache-rebuild post']]
60+
require => [User['www-data'], Exec['uit-cms-drush-deploy']]
8161
}
8262

8363
cron { 'uit-cms-curator-sync':
@@ -86,7 +66,7 @@
8666
user => 'www-data',
8767
hour => '*',
8868
minute => '*',
89-
require => [User['www-data'], Exec['uit-cms-cache-rebuild post']]
69+
require => [User['www-data'], Exec['uit-cms-drush-deploy']]
9070
}
9171

9272
profiles::php::fpm_service_alias { 'uit-cms': }

‎spec/classes/uit/cms/deployment_spec.rb‎

Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -45,39 +45,13 @@
4545
'group' => 'www-data'
4646
) }
4747

48-
it { is_expected.to contain_exec('uit-cms-cache-rebuild pre').with(
49-
'command' => 'drush cache:rebuild',
50-
'cwd' => '/var/www/uit-cms',
51-
'path' => ['/usr/local/bin', '/usr/bin', '/bin', '/var/www/uit-cms/vendor/bin'],
52-
'environment' => ['HOME=/'],
53-
'user' => 'www-data',
54-
'refreshonly' => true
55-
) }
56-
57-
it { is_expected.to contain_exec('uit-cms-updatedb').with(
58-
'command' => 'drush updatedb -y',
59-
'cwd' => '/var/www/uit-cms',
60-
'path' => ['/usr/local/bin', '/usr/bin', '/bin', '/var/www/uit-cms/vendor/bin'],
61-
'environment' => ['HOME=/'],
62-
'user' => 'www-data',
63-
'refreshonly' => true
64-
) }
65-
66-
it { is_expected.to contain_exec('uit-cms-config-import').with(
67-
'command' => 'drush config:import -y',
68-
'cwd' => '/var/www/uit-cms',
69-
'path' => ['/usr/local/bin', '/usr/bin', '/bin', '/var/www/uit-cms/vendor/bin'],
70-
'environment' => ['HOME=/'],
71-
'user' => 'www-data',
72-
'refreshonly' => true
73-
) }
74-
75-
it { is_expected.to contain_exec('uit-cms-cache-rebuild post').with(
76-
'command' => 'drush cache:rebuild',
48+
it { is_expected.to contain_exec('uit-cms-drush-deploy').with(
49+
'command' => 'drush deploy -v -y',
7750
'cwd' => '/var/www/uit-cms',
7851
'path' => ['/usr/local/bin', '/usr/bin', '/bin', '/var/www/uit-cms/vendor/bin'],
7952
'environment' => ['HOME=/'],
8053
'user' => 'www-data',
54+
'logoutput' => 'on_failure',
8155
'refreshonly' => true
8256
) }
8357

@@ -113,29 +87,14 @@
11387
it { is_expected.to contain_file('uit-cms-drush-config').that_requires('User[www-data]') }
11488
it { is_expected.to contain_file('uit-cms-drush-config').that_requires('Package[uit-cms]') }
11589
it { is_expected.to contain_file('uit-cms-drush-config').that_notifies('Service[uit-cms]') }
116-
it { is_expected.to contain_exec('uit-cms-cache-rebuild pre').that_requires('User[www-data]') }
117-
it { is_expected.to contain_exec('uit-cms-cache-rebuild pre').that_subscribes_to('Package[uit-cms]') }
118-
it { is_expected.to contain_exec('uit-cms-cache-rebuild pre').that_subscribes_to('File[uit-cms-settings]') }
119-
it { is_expected.to contain_exec('uit-cms-cache-rebuild pre').that_subscribes_to('File[uit-cms-drush-config]') }
120-
it { is_expected.to contain_exec('uit-cms-updatedb').that_requires('User[www-data]') }
121-
it { is_expected.to contain_exec('uit-cms-updatedb').that_subscribes_to('Package[uit-cms]') }
122-
it { is_expected.to contain_exec('uit-cms-updatedb').that_subscribes_to('File[uit-cms-settings]') }
123-
it { is_expected.to contain_exec('uit-cms-updatedb').that_subscribes_to('File[uit-cms-drush-config]') }
124-
it { is_expected.to contain_exec('uit-cms-updatedb').that_requires('Exec[uit-cms-cache-rebuild pre]') }
125-
it { is_expected.to contain_exec('uit-cms-config-import').that_requires('User[www-data]') }
126-
it { is_expected.to contain_exec('uit-cms-config-import').that_subscribes_to('Package[uit-cms]') }
127-
it { is_expected.to contain_exec('uit-cms-config-import').that_subscribes_to('File[uit-cms-settings]') }
128-
it { is_expected.to contain_exec('uit-cms-config-import').that_subscribes_to('File[uit-cms-drush-config]') }
129-
it { is_expected.to contain_exec('uit-cms-config-import').that_requires('Exec[uit-cms-updatedb]') }
130-
it { is_expected.to contain_exec('uit-cms-cache-rebuild post').that_requires('User[www-data]') }
131-
it { is_expected.to contain_exec('uit-cms-cache-rebuild post').that_subscribes_to('Package[uit-cms]') }
132-
it { is_expected.to contain_exec('uit-cms-cache-rebuild post').that_subscribes_to('File[uit-cms-settings]') }
133-
it { is_expected.to contain_exec('uit-cms-cache-rebuild post').that_subscribes_to('File[uit-cms-drush-config]') }
134-
it { is_expected.to contain_exec('uit-cms-cache-rebuild post').that_requires('Exec[uit-cms-config-import]') }
90+
it { is_expected.to contain_exec('uit-cms-drush-deploy').that_requires('User[www-data]') }
91+
it { is_expected.to contain_exec('uit-cms-drush-deploy').that_subscribes_to('Package[uit-cms]') }
92+
it { is_expected.to contain_exec('uit-cms-drush-deploy').that_subscribes_to('File[uit-cms-settings]') }
93+
it { is_expected.to contain_exec('uit-cms-drush-deploy').that_subscribes_to('File[uit-cms-drush-config]') }
13594
it { is_expected.to contain_cron('uit-cms-core-cron').that_requires('User[www-data]') }
136-
it { is_expected.to contain_cron('uit-cms-core-cron').that_requires('Exec[uit-cms-cache-rebuild post]') }
95+
it { is_expected.to contain_cron('uit-cms-core-cron').that_requires('Exec[uit-cms-drush-deploy]') }
13796
it { is_expected.to contain_cron('uit-cms-curator-sync').that_requires('User[www-data]') }
138-
it { is_expected.to contain_cron('uit-cms-curator-sync').that_requires('Exec[uit-cms-cache-rebuild post]') }
97+
it { is_expected.to contain_cron('uit-cms-curator-sync').that_requires('Exec[uit-cms-drush-deploy]') }
13998
it { is_expected.to contain_service('uit-cms').that_requires('Profiles::Php::Fpm_service_alias[uit-cms]') }
14099

141100
context "without hieradata" do

0 commit comments

Comments
 (0)