diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index f8edf65bd..88289e70a 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -87,6 +87,7 @@ rm_conffile /etc/plinth/modules-enabled/users 23.10~ rm_conffile /etc/plinth/modules-enabled/wireguard 23.10~ rm_conffile /etc/plinth/modules-enabled/wordpress 23.10~ rm_conffile /etc/plinth/modules-enabled/zoph 23.10~ +rm_conffile /etc/apache2/conf-available/deluge-plinth.conf 23.10~ rm_conffile /etc/gitweb-freedombox.conf 23.10~ rm_conffile /etc/apache2/conf-available/gitweb-freedombox.conf 23.10~ rm_conffile /etc/apache2/conf-available/gitweb-freedombox-auth.conf 23.10~ diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py index 4c7e5daed..d2e1dc5ba 100644 --- a/plinth/modules/deluge/__init__.py +++ b/plinth/modules/deluge/__init__.py @@ -5,6 +5,7 @@ from django.utils.translation import gettext_lazy as _ from plinth import app as app_module from plinth import frontpage, menu +from plinth.config import DropinConfigs from plinth.daemon import Daemon from plinth.modules.apache.components import Webserver from plinth.modules.backups.components import BackupRestore @@ -30,7 +31,7 @@ class DelugeApp(app_module.App): app_id = 'deluge' - _version = 7 + _version = 8 def __init__(self): """Create components for the app.""" @@ -65,6 +66,11 @@ class DelugeApp(app_module.App): packages = Packages('packages-deluge', ['deluged', 'deluge-web']) self.add(packages) + dropin_configs = DropinConfigs( + 'dropin-configs-deluge', + ['/etc/apache2/conf-available/deluge-plinth.conf']) + self.add(dropin_configs) + firewall = Firewall('firewall-deluge', info.name, ports=['http', 'https'], is_external=True) self.add(firewall) diff --git a/plinth/modules/deluge/data/etc/apache2/conf-available/deluge-plinth.conf b/plinth/modules/deluge/data/usr/share/freedombox/etc/apache2/conf-available/deluge-plinth.conf similarity index 100% rename from plinth/modules/deluge/data/etc/apache2/conf-available/deluge-plinth.conf rename to plinth/modules/deluge/data/usr/share/freedombox/etc/apache2/conf-available/deluge-plinth.conf