dismantle all arch infrastructure

bundles/nginx/files/arch-override.conf

@@ -1,9 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/nginx -c /etc/nginx/nginx.conf
-
-ExecReload=
-ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/run/nginx.pid)"
-
-ExecStop=
-ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/run/nginx.pid)"

bundles/nginx/files/nginx.conf

@@ -1,4 +1,4 @@
-user  ${username};
+user  www-data;
 worker_processes  ${worker_processes};
 
 pid        /var/run/nginx.pid;

bundles/nginx/items.py

@@ -1,12 +1,5 @@
 from datetime import datetime, timedelta
 
-if node.has_bundle('pacman'):
-    package = 'pkg_pacman:nginx'
-    username = 'http'
-else:
-    package = 'pkg_apt:nginx'
-    username = 'www-data'
-
 directories = {
     '/etc/nginx/sites': {
         'purge': True,
@@ -24,9 +17,9 @@ directories = {
         },
     },
     '/var/log/nginx-timing': {
-        'owner': username,
+        'owner': 'www-data',
         'needs': {
-            package,
+            'pkg_apt:nginx',
         },
     },
     '/var/www': {},
@@ -40,7 +33,6 @@ files = {
     '/etc/nginx/nginx.conf': {
         'content_type': 'mako',
         'context': {
-            'username': username,
             **node.metadata['nginx'],
         },
         'triggers': {
@@ -69,21 +61,13 @@ files = {
     '/var/www/error.html': {},
     '/var/www/not_found.html': {},
 }
-if node.has_bundle('pacman'):
-    files['/etc/systemd/system/nginx.service.d/bundlewrap.conf'] = {
-        'source': 'arch-override.conf',
-        'triggers': {
-            'action:systemd-reload',
-            'svc_systemd:nginx:restart',
-        },
-    }
 
 svc_systemd = {
     'nginx': {
         'needs': {
             'action:generate-dhparam',
             'directory:/var/log/nginx-timing',
-            package,
+            'pkg_apt:nginx',
         },
     },
 }

bundles/nginx/metadata.py

@@ -33,11 +33,6 @@ defaults = {
     'nginx': {
         'worker_connections': 768,
     },
-    'pacman': {
-        'packages': {
-            'nginx': {},
-        },
-    },
 }
 
 if node.has_bundle('telegraf'):