From 2dd0b5649da0836f64136a47b0d9e2fcb925778f Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: May 02 2018 04:24:27 +0000 Subject: remove systemd service definition stuff Nowadays we are only deploying in containerised environments, which do not use systemd. So this stuff is unused and can be deleted. --- diff --git a/MANIFEST.in b/MANIFEST.in index 455a411..1edd420 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,4 +7,3 @@ include fedmsg.d/*.py recursive-include conf * exclude conf/settings.py recursive-include docs *.py *.rst *.inv Makefile -recursive-include systemd * diff --git a/greenwave.spec b/greenwave.spec index a864482..f2e5ce5 100644 --- a/greenwave.spec +++ b/greenwave.spec @@ -10,8 +10,6 @@ URL: https://pagure.io/greenwave Source0: https://files.pythonhosted.org/packages/source/g/%{name}/%{name}-%{upstream_version}.tar.gz BuildRequires: python2-devel -%{?systemd_requires} -BuildRequires: systemd %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python2-setuptools BuildRequires: python2-sphinx @@ -72,11 +70,6 @@ DEV=true GREENWAVE_CONFIG=$(pwd)/conf/settings.py.example make -C docs SPHINXOPT %install %py2_install -install -d %{buildroot}%{_unitdir} -install -m0644 \ - systemd/%{name}.service \ - systemd/%{name}.socket \ - %{buildroot}%{_unitdir} %check export PYTHONPATH=%{buildroot}/%{python2_sitelib} @@ -90,19 +83,6 @@ TEST=true GREENWAVE_CONFIG=$(pwd)/conf/settings.py.example py.test greenwave/tes %endif %{python2_sitelib}/%{name} %{python2_sitelib}/%{name}*.egg-info -%{_unitdir}/%{name}.service -%{_unitdir}/%{name}.socket %{_sysconfdir}/fedmsg.d/* -%post -%systemd_post %{name}.service -%systemd_post %{name}.socket - -%preun -%systemd_preun %{name}.service -%systemd_preun %{name}.socket - -%postun -%systemd_postun_with_restart %{name}.service - %changelog diff --git a/systemd/greenwave.service b/systemd/greenwave.service deleted file mode 100644 index e7859bd..0000000 --- a/systemd/greenwave.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Greenwave Daemon -Requires=greenwave.socket -After=network.target - -[Service] -EnvironmentFile=-/etc/sysconfig/greenwave -ExecStart=/usr/bin/gunicorn \ - --workers 8 \ - --bind unix:/run/greenwave/socket \ - greenwave.wsgi:app - -[Install] -WantedBy=multi-user.target diff --git a/systemd/greenwave.socket b/systemd/greenwave.socket deleted file mode 100644 index c51c7f1..0000000 --- a/systemd/greenwave.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Greenwave Socket - -[Socket] -ListenStream=/run/greenwave/socket - -[Install] -WantedBy=sockets.target