Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/291527
Change subject: service: Let other methods of deployment work in uwsgi ...................................................................... service: Let other methods of deployment work in uwsgi Change-Id: I5c94f8852b6e2b62f7d4b5df15e8e26de866a713 --- M modules/service/manifests/uwsgi.pp 1 file changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/291527/1 diff --git a/modules/service/manifests/uwsgi.pp b/modules/service/manifests/uwsgi.pp index 0857f4e..cf196f3 100644 --- a/modules/service/manifests/uwsgi.pp +++ b/modules/service/manifests/uwsgi.pp @@ -37,13 +37,16 @@ # [*local_logging*] # Whether to store log entries on the target node as well. Default: true # +# [*deployment*] +# Method of deployment. Default: 'scap3' +# # [*deployment_user*] # The user that will own the service code. Only applicable when -# $deployment ='scap3'. Default: $title +# $deployment = 'scap3'. Default: 'deploy-service' # # [*deployment_manage_user*] # Boolean. Whether or not scap::target manages user. Only applicable -# when $deployment ='scap3'. Default: false +# when $deployment = 'scap3'. Default: true # # === Examples # @@ -67,14 +70,17 @@ $repo = "${title}/deploy", $firejail = true, $local_logging = true, + $deployment = 'scap3', $deployment_user = 'deploy-service', $deployment_manage_user = true, ) { - scap::target { $repo: - service_name => $title, - deploy_user => $deployment_user, - before => Uwsgi::App[$title], - manage_user => $deployment_manage_user, + if $deployment == 'scap3' { + scap::target { $repo: + service_name => $title, + deploy_user => $deployment_user, + before => Uwsgi::App[$title], + manage_user => $deployment_manage_user, + } } # Import all common configuration -- To view, visit https://gerrit.wikimedia.org/r/291527 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c94f8852b6e2b62f7d4b5df15e8e26de866a713 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits