# HG changeset patch # User ymh # Date 1477050603 -7200 # Node ID b4f69e646e44d177f26774fb371a4cbdba1bfdd1 # Parent 0b14f178ca53fff70f4adbb325241988cdca7593 add artisan action after upgrade, correct provisioning diff -r 0b14f178ca53 -r b4f69e646e44 build/post_install.sh --- a/build/post_install.sh Fri Oct 21 09:26:28 2016 +0200 +++ b/build/post_install.sh Fri Oct 21 13:50:03 2016 +0200 @@ -1,4 +1,15 @@ #!/usr/bin/env sh +if [ -d /var/www/corpusdelaparole/corpus-back/ ]; then + pushd /var/www/corpusdelaparole/corpus-back/ + + echo "Correcting file permissions for back office" + chgrp -R apache storage bootstrap/cache + chmod -R ug+rwx storage bootstrap/cache + + popd +fi + + echo "Restart httpd" /usr/bin/systemctl restart httpd diff -r 0b14f178ca53 -r b4f69e646e44 build/post_upgrade.sh --- a/build/post_upgrade.sh Fri Oct 21 09:26:28 2016 +0200 +++ b/build/post_upgrade.sh Fri Oct 21 13:50:03 2016 +0200 @@ -8,5 +8,21 @@ /usr/local/bin/drush -r /var/www/corpusdelaparole/drupal cc all fi +if [ -d /var/www/corpusdelaparole/corpus-back/ ]; then + pushd /var/www/corpusdelaparole/corpus-back/ + + echo "Migrating back office database" + php artisan migrate + + echo "Optimizing framework" + php artisan optimize + + echo "Correcting file permissions for back office" + chgrp -R apache storage bootstrap/cache + chmod -R ug+rwx storage bootstrap/cache + + popd +fi + echo "Restart httpd" /usr/bin/systemctl restart httpd diff -r 0b14f178ca53 -r b4f69e646e44 dev/provisioning/custom.yaml.tmpl --- a/dev/provisioning/custom.yaml.tmpl Fri Oct 21 09:26:28 2016 +0200 +++ b/dev/provisioning/custom.yaml.tmpl Fri Oct 21 13:50:03 2016 +0200 @@ -18,6 +18,10 @@ # database server port sysconfig::params::db_port : 3306 +# sesame host +sysconfig::params::sesame_host : 127.0.0.1 +# sesame port +sysconfig::params::sesame_port : 8080 # elasticsearch host sysconfig::params::es_host : 127.0.0.1 diff -r 0b14f178ca53 -r b4f69e646e44 dev/provisioning/modules/sysconfig/manifests/corpus.pp --- a/dev/provisioning/modules/sysconfig/manifests/corpus.pp Fri Oct 21 09:26:28 2016 +0200 +++ b/dev/provisioning/modules/sysconfig/manifests/corpus.pp Fri Oct 21 13:50:03 2016 +0200 @@ -7,6 +7,8 @@ $db_pw = hiera('sysconfig::params::db_pw', $sysconfig::params::db_pw), $db_host = hiera('sysconfig::params::db_host', $sysconfig::params::db_host), $db_port = hiera('sysconfig::params::db_port', $sysconfig::params::db_port), + $sesame_host = hiera('sysconfig::params::sesame_host', $sysconfig::params::sesame_host), + $sesame_port = hiera('sysconfig::params::sesame_port', $sysconfig::params::sesame_port), $es_host = hiera('sysconfig::params::es_host', $sysconfig::params::es_host), $es_port = hiera('sysconfig::params::es_port', $sysconfig::params::es_port), $es_instance = hiera('sysconfig::params::es_instance', $sysconfig::params::es_instance), diff -r 0b14f178ca53 -r b4f69e646e44 dev/provisioning/modules/sysconfig/manifests/drupal.pp --- a/dev/provisioning/modules/sysconfig/manifests/drupal.pp Fri Oct 21 09:26:28 2016 +0200 +++ b/dev/provisioning/modules/sysconfig/manifests/drupal.pp Fri Oct 21 13:50:03 2016 +0200 @@ -23,6 +23,7 @@ default_version => '7', autoupdate => true, ensure_extra_packages => false, + bash_autocompletion => false, extra_packages => [ 'bzip2', 'gzip', 'less', 'mariadb', 'rsync', 'unzip', 'wget' ], extensions => ['drush_extras'], php_path => '/opt/remi/php56/root/usr/bin/php', diff -r 0b14f178ca53 -r b4f69e646e44 dev/provisioning/modules/sysconfig/manifests/params.pp --- a/dev/provisioning/modules/sysconfig/manifests/params.pp Fri Oct 21 09:26:28 2016 +0200 +++ b/dev/provisioning/modules/sysconfig/manifests/params.pp Fri Oct 21 13:50:03 2016 +0200 @@ -7,6 +7,9 @@ $db_host = hiera('sysconfig::params::db_host','127.0.0.1') $db_port = hiera('sysconfig::params::db_port','3306') + $sesame_host = hiera('sysconfig::params::sesame_host', '127.0.0.1') + $sesame_port = hiera('sysconfig::params::sesame_port', '8080') + $es_host = hiera('sysconfig::params::es_host', '127.0.0.1') $es_port = hiera('sysconfig::params::es_port', '9200') $es_instance = hiera('sysconfig::params::es_instance', 'es_01')