From 420fe6f3a439142084d8549a05bc79b0d2486556 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 12:33:25 -0200 Subject: Install drush from git repo --- manifests/init.pp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9d71ecf..20e08c1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,12 +4,12 @@ class drupal( $www_folder = hiera('drupal::www_folder', '/var/www/data') ) { # We use drupal source from upstream - package { "drupal6": + package { [ "drupal6", "drush" ]: ensure => absent, } # Needed packages - package { [ "drush", "php5-gd", "php5-imagick" ]: + package { [ "php5-gd", "php5-imagick" ]: ensure => installed, } @@ -150,4 +150,20 @@ class drupal( force => true, backup => false, } + + vcsrepo { "/usr/local/share/drush": + ensure => present, + provider => git, + source => 'https://github.com/drush-ops/drush', + revision => '401f034c59b031221d900bec7c2ba81d1331c284', + owner => 'root', + group => 'root', + } + + file { "/usr/local/bin/drush": + ensure => '/usr/local/share/drush/drush', + owner => root, + group => root, + require => Vcrepo['/usr/local/share/drush'], + } } -- cgit v1.2.3 From fcee611a3c88891d43143daf4215b95945339ac5 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 12:35:31 -0200 Subject: Dependency fix --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 20e08c1..4fcd341 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -164,6 +164,6 @@ class drupal( ensure => '/usr/local/share/drush/drush', owner => root, group => root, - require => Vcrepo['/usr/local/share/drush'], + require => Vcsrepo['/usr/local/share/drush'], } } -- cgit v1.2.3 From 1a542bada6c5d92441dc0d9dd9de383a580cad67 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 14:27:04 -0200 Subject: Installs composer --- manifests/init.pp | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4fcd341..b82ec0c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -160,10 +160,34 @@ class drupal( group => 'root', } + # Composer + exec { 'getcomposer': + command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php && /bin/mv composer.phar /usr/local/bin/composer', + user => 'root', + cwd => '/tmp', + creates => '/usr/local/bin/composer', + require => Package['curl'], + } + file { "/usr/local/bin/drush": ensure => '/usr/local/share/drush/drush', owner => root, group => root, - require => Vcsrepo['/usr/local/share/drush'], - } + require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ], + } + + #exec { 'getdrush': + # command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0-rc3/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', + # user => 'root', + # cwd => '/tmp', + # creates => '/usr/local/bin/drush', + #} + + #exec { 'composer-drush': + # command => '/usr/local/bin/composer global require drush/drush:dev-master', + # user => 'vagrant', + # creates => '/home/vagrant/composer/vendor/bin/drush', + # environment => [ 'COMPOSER_HOME="/vagrant"' ], + # require => Exec['getcomposer'], + #} } -- cgit v1.2.3 From 45213ef045a31fac9cda266a2a1794b477671f24 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 14:28:41 -0200 Subject: Dependency fix --- manifests/init.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index b82ec0c..a2318c8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -166,7 +166,6 @@ class drupal( user => 'root', cwd => '/tmp', creates => '/usr/local/bin/composer', - require => Package['curl'], } file { "/usr/local/bin/drush": -- cgit v1.2.3 From 9c41f88f26458e661bfdd71e90ee24f9d74b7b2c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 14:44:39 -0200 Subject: Change drush install strategy --- manifests/init.pp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a2318c8..78e3fcb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -168,20 +168,20 @@ class drupal( creates => '/usr/local/bin/composer', } - file { "/usr/local/bin/drush": - ensure => '/usr/local/share/drush/drush', - owner => root, - group => root, - require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ], - } - - #exec { 'getdrush': - # command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0-rc3/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', - # user => 'root', - # cwd => '/tmp', - # creates => '/usr/local/bin/drush', + #file { "/usr/local/bin/drush": + # ensure => '/usr/local/share/drush/drush', + # owner => root, + # group => root, + # require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ], #} + exec { 'getdrush': + command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', + user => 'root', + cwd => '/tmp', + creates => '/usr/local/bin/drush', + } + #exec { 'composer-drush': # command => '/usr/local/bin/composer global require drush/drush:dev-master', # user => 'vagrant', -- cgit v1.2.3 From 30da9ca63f5576cac73292b6191b7d1ae1844aa4 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 14:46:14 -0200 Subject: Comment drush vcsrepo --- manifests/init.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 78e3fcb..adb79f5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -151,14 +151,14 @@ class drupal( backup => false, } - vcsrepo { "/usr/local/share/drush": - ensure => present, - provider => git, - source => 'https://github.com/drush-ops/drush', - revision => '401f034c59b031221d900bec7c2ba81d1331c284', - owner => 'root', - group => 'root', - } + #vcsrepo { "/usr/local/share/drush": + # ensure => present, + # provider => git, + # source => 'https://github.com/drush-ops/drush', + # revision => '401f034c59b031221d900bec7c2ba81d1331c284', + # owner => 'root', + # group => 'root', + #} # Composer exec { 'getcomposer': -- cgit v1.2.3 From 75f74ae6dfb413f4a4c2549124b36f1f85357ab4 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Nov 2015 14:46:57 -0200 Subject: Code organization --- manifests/init.pp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index adb79f5..11a58f0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -151,6 +151,14 @@ class drupal( backup => false, } + # Composer + exec { 'getcomposer': + command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php && /bin/mv composer.phar /usr/local/bin/composer', + user => 'root', + cwd => '/tmp', + creates => '/usr/local/bin/composer', + } + #vcsrepo { "/usr/local/share/drush": # ensure => present, # provider => git, @@ -160,14 +168,6 @@ class drupal( # group => 'root', #} - # Composer - exec { 'getcomposer': - command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php && /bin/mv composer.phar /usr/local/bin/composer', - user => 'root', - cwd => '/tmp', - creates => '/usr/local/bin/composer', - } - #file { "/usr/local/bin/drush": # ensure => '/usr/local/share/drush/drush', # owner => root, @@ -175,13 +175,6 @@ class drupal( # require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ], #} - exec { 'getdrush': - command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', - user => 'root', - cwd => '/tmp', - creates => '/usr/local/bin/drush', - } - #exec { 'composer-drush': # command => '/usr/local/bin/composer global require drush/drush:dev-master', # user => 'vagrant', @@ -189,4 +182,11 @@ class drupal( # environment => [ 'COMPOSER_HOME="/vagrant"' ], # require => Exec['getcomposer'], #} + + exec { 'getdrush': + command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', + user => 'root', + cwd => '/tmp', + creates => '/usr/local/bin/drush', + } } -- cgit v1.2.3