reverting changes to install.pp before next release

NOAO · Mar 16, 2022 · 8a45976 · 8a45976
1 parent 7e98324
commit 8a45976
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/files/gunicorn.service b/files/gunicorn.service
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -45,7 +45,7 @@
   #!include augeas
   ensure_resource('package', ['git', ], {'ensure' => 'present'})
   package{ ['epel-release', 'jemalloc', 'ganglia',
-            'nginx',
+            'nginx', 'supervisor',
             'xinetd'] : }
 
   group { 'tada':
@@ -358,17 +358,16 @@
     ensure  => 'present',      
     source  => 'puppet:///modules/marsnat/uwsgi_params',
   } 
-  file { '/etc/systemd/system/gunicorn.service' :
-    ensure  => 'present',
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    replace => true,
-    source  => 'puppet:///modules/marsnat/gunicorn.service'
+  file { '/etc/supervisord.d' :
+    ensure => 'directory',
+  }
+  file { '/etc/supervisord.d/supervisor-app.conf' :
+    ensure  => 'file',
+    source  => 'puppet:///modules/marsnat/nginx/supervisor-app.conf',
   }
-  ~> service {'gunicorn':
-    ensure => 'running',
-    subscribe => [ Vcsrepo['/opt/mars'] ],
+  file { '/etc/supervisord.conf' :
+    ensure  => 'file',
+    source  => 'puppet:///modules/marsnat/nginx/supervisord.conf',
   }
   file { '/etc/gunicorn-conf.py' :
     ensure  => 'file',