qubes-network-server.spec

@@ -3,7 +3,7 @@
 %define mybuildnumber %{?build_number}%{?!build_number:1}
 
 Name:           qubes-network-server
-Version:        0.1.6
+Version:        0.1.3
 Release:        %{mybuildnumber}%{?dist}
 Summary:        Turn your Qubes OS into a network server
 BuildArch:      noarch
@@ -92,26 +92,6 @@ tox --current-env
 %post
 %systemd_post  qubes-routing-manager.service
 
-%posttrans
-# Remove old unit enablement paths.
-reenable=0
-if [ -h %{_sysconfdir}/systemd/system/multi-user.target.wants/qubes-routing-manager.service ]
-then
-    reenable=1
-    rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/qubes-routing-manager.service
-fi
-if [ -h %{_sysconfdir}/systemd/system/qubes-iptables.service.wants/qubes-routing-manager.service ]
-then
-    reenable=1
-    rm -f %{_sysconfdir}/systemd/system/qubes-iptables.service.wants/qubes-routing-manager.service
-fi
-if [ $reenable = 1 ]
-then
-    mkdir -p %{_sysconfdir}/systemd/system/qubes-network.service.wants
-    ln -sf %{_unitdir}/qubes-routing-manager.service %{_sysconfdir}/systemd/system/qubes-network.service.wants/qubes-routing-manager.service
-fi
-exit 0
-
 %preun
 %systemd_preun qubes-routing-manager.service
 

src/qubes-routing-manager.service.in

@@ -1,13 +1,12 @@
 [Unit]
 Description=Configure the network to allow network server VMs
 Documentation=https://github.com/Rudd-O/qubes-network-server
-After=qubes-network.service qubes-iptables.service
+After=qubes-iptables.service
 BindsTo=qubes-iptables.service
-ConditionPathExists=/var/run/qubes-service/qubes-network
 
 [Service]
 Type=notify
 ExecStart=@SBINDIR@/qubes-routing-manager
 
 [Install]
-WantedBy=qubes-network.service
+WantedBy=qubes-iptables.service