Skip to content
Snippets Groups Projects
Commit ff9f8763 authored by Matthieu Faure's avatar Matthieu Faure
Browse files

re-enable perms check on dirs tmp/

parent e4c71131
No related branches found
No related tags found
1 merge request!5Resolve "Create Comptoir Puppet module"
Pipeline #3993 passed
...@@ -63,7 +63,7 @@ class comptoir ( ...@@ -63,7 +63,7 @@ class comptoir (
} }
# Install app with Composer # Install app with Composer
-> exec { 'Install app with Composer': -> exec { 'composer install':
command => '/usr/local/bin/composer --no-progress install', command => '/usr/local/bin/composer --no-progress install',
cwd => $comptoir_dir, cwd => $comptoir_dir,
user => $comptoir_user, user => $comptoir_user,
...@@ -79,7 +79,7 @@ class comptoir ( ...@@ -79,7 +79,7 @@ class comptoir (
user => $comptoir_user, user => $comptoir_user,
environment => [ 'HOME=/home/comptoir' ], environment => [ 'HOME=/home/comptoir' ],
onlyif => "/bin/grep '//COMPTOIR-DEBUG' ${_file_app_php}", onlyif => "/bin/grep '//COMPTOIR-DEBUG' ${_file_app_php}",
require => Exec['Install app with Composer'], require => Exec['composer install'],
} }
-> exec { 'Comptoir APP.PHP barman-DEV': -> exec { 'Comptoir APP.PHP barman-DEV':
command => "${_my_sed} ${_sed_barman_dev} ${_file_app_php}", command => "${_my_sed} ${_sed_barman_dev} ${_file_app_php}",
...@@ -97,7 +97,7 @@ class comptoir ( ...@@ -97,7 +97,7 @@ class comptoir (
user => $comptoir_user, user => $comptoir_user,
environment => [ 'HOME=/home/comptoir' ], environment => [ 'HOME=/home/comptoir' ],
onlyif => "/bin/grep '__SALT__' ${_file_app_php}", onlyif => "/bin/grep '__SALT__' ${_file_app_php}",
require => Exec['Install app with Composer'], require => Exec['composer install'],
} }
-> exec { 'Comptoir APP.PHP Session default': -> exec { 'Comptoir APP.PHP Session default':
command => "${_my_sed} \"s!'php',!env('SESSION_DEFAULTS', 'php'), !\" ${_file_app_php}", command => "${_my_sed} \"s!'php',!env('SESSION_DEFAULTS', 'php'), !\" ${_file_app_php}",
...@@ -112,37 +112,19 @@ class comptoir ( ...@@ -112,37 +112,19 @@ class comptoir (
path => $_file_comptoir_php, path => $_file_comptoir_php,
content => template('comptoir/comptoir.php.epp'), content => template('comptoir/comptoir.php.epp'),
owner => $comptoir_user, owner => $comptoir_user,
require => Exec['Install app with Composer'], require => Exec['composer install'],
} }
# Note: is it really useful compared to 'Comptoir tmp/' as only files in tmp/ are modified ?
# file { 'Chmod -R o-w':
# ensure => directory,
# path => $comptoir_dir,
# mode => 'o-w',
# recurse => true,
# require => Exec['Install app with Composer'],
# }
# Set permissions on directories tmp/ logs/ webroot/ # Set permissions on directories tmp/ logs/ webroot/
# file { 'Comptoir tmp/': file { 'Comptoir tmp/':
# ensure => directory, ensure => directory,
# path => "${comptoir_dir}/tmp", path => "${comptoir_dir}/tmp",
# mode => '0755', mode => '0755',
# owner => $apache_user, owner => $apache_user,
# group => $comptoir_user, group => $comptoir_user,
# recurse => true, recurse => true,
# require => Exec['Install app with Composer'], require => Exec['composer install'],
# } }
# file { 'Comptoir webroot/':
# ensure => directory,
# path => "${comptoir_dir}/webroot",
# mode => '0755',
# owner => $apache_user,
# group => $comptoir_user,
# recurse => true,
# require => Exec['Install app with Composer'],
# }
# file { 'Comptoir logs/': # file { 'Comptoir logs/':
# ensure => directory, # ensure => directory,
# path => "${comptoir_dir}/logs", # path => "${comptoir_dir}/logs",
...@@ -150,7 +132,7 @@ class comptoir ( ...@@ -150,7 +132,7 @@ class comptoir (
# owner => $apache_user, # owner => $apache_user,
# group => $comptoir_user, # group => $comptoir_user,
# recurse => true, # recurse => true,
# require => Exec['Install app with Composer'], # require => Exec['composer install'],
# } # }
# TODO: find "Comptoir-srv/$i" -type f -exec sudo chmod 664 {} \; # TODO: find "Comptoir-srv/$i" -type f -exec sudo chmod 664 {} \;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment