Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242402
Change subject: dynamicproxy: Build proper invisible-unicorn package
......................................................................
dynamicproxy: Build proper invisible-unicorn package
- Contains its own systemd service
- In gbp format in labs/invisible-unicorn repo
Change-Id: I866de2325f7bcb81e57514cd7c4018973090d82a
---
D modules/dynamicproxy/files/upstart.conf
M modules/dynamicproxy/manifests/api.pp
2 files changed, 1 insertion(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/242402/1
diff --git a/modules/dynamicproxy/files/upstart.conf
b/modules/dynamicproxy/files/upstart.conf
deleted file mode 100644
index 5d697ea..0000000
--- a/modules/dynamicproxy/files/upstart.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-description "API for the dynamic proxy, aka Invisible Unicorn"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-respawn limit 10 5
-
-script
- /usr/bin/uwsgi --logto /var/log/uwsgi/app/invisible.log
--buffer-size=32768 --plugin python --die-on-term -s /tmp/uwsgi.sock --module
invisible_unicorn.api --callable app --processes 4 --threads 2 --master true
--uid www-data
-end script
diff --git a/modules/dynamicproxy/manifests/api.pp
b/modules/dynamicproxy/manifests/api.pp
index 7d7d81d..4d5e676 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -11,37 +11,10 @@
desc => 'API for adding / removing proxies from dynamicproxy
domainproxy'
}
- package { 'python-flask':
- ensure => latest,
- require => Class['misc::labsdebrepo'],
- }
-
- package { ['python-invisible-unicorn', 'python-flask-sqlalchemy', 'uwsgi',
'uwsgi-plugin-python']:
- ensure => present,
- require => Package['python-flask'],
- }
-
- file { '/etc/init/dynamicproxy-api.conf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/dynamicproxy/upstart.conf',
- before => Service['dynamicproxy-api'],
- notify => Service['dynamicproxy-api'],
- }
+ require_package('invisible-unicorn')
service { 'dynamicproxy-api':
ensure => running,
- enable => true,
- require => [
- Package['python-invisible-unicorn'],
- Package['python-flask-sqlalchemy'],
- Package['redis-server'],
- Package['python-flask'],
- Package['uwsgi'],
- Package['uwsgi-plugin-python'],
- ],
}
file { '/etc/dynamicproxy-api':
--
To view, visit https://gerrit.wikimedia.org/r/242402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I866de2325f7bcb81e57514cd7c4018973090d82a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
