diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index 00ce01c54..e1ed7df47 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -89,6 +89,8 @@ rm_conffile /etc/plinth/modules-enabled/wordpress 23.10~ rm_conffile /etc/plinth/modules-enabled/zoph 23.10~ rm_conffile /etc/apache2/conf-available/php-fpm-freedombox.conf 23.10~ rm_conffile /etc/fail2ban/jail.d/apache-auth-freedombox.conf 23.10~ +rm_conffile /etc/apache2/conf-available/bepasty-freedombox.conf 23.10~ +rm_conffile /etc/uwsgi/apps-available/bepasty-freedombox.ini 23.10~ rm_conffile /etc/apache2/conf-available/deluge-plinth.conf 23.10~ rm_conffile /etc/dovecot/conf.d/15-freedombox-mail.conf 23.10~ rm_conffile /etc/dovecot/conf.d/05-freedombox-passdb.conf 23.10~ diff --git a/plinth/modules/bepasty/__init__.py b/plinth/modules/bepasty/__init__.py index 8b2b9a423..ac0a47863 100644 --- a/plinth/modules/bepasty/__init__.py +++ b/plinth/modules/bepasty/__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.modules.apache.components import Uwsgi, Webserver from plinth.modules.backups.components import BackupRestore from plinth.modules.firewall.components import Firewall @@ -47,7 +48,7 @@ class BepastyApp(app_module.App): app_id = 'bepasty' - _version = 2 + _version = 3 def __init__(self): """Create components for the app.""" @@ -74,6 +75,12 @@ class BepastyApp(app_module.App): packages = Packages('packages-bepasty', ['bepasty']) self.add(packages) + dropin_configs = DropinConfigs('dropin-configs-bepasty', [ + '/etc/apache2/conf-available/bepasty-freedombox.conf', + '/etc/uwsgi/apps-available/bepasty-freedombox.ini' + ]) + self.add(dropin_configs) + firewall = Firewall('firewall-bepasty', info.name, ports=['http', 'https'], is_external=True) self.add(firewall) diff --git a/plinth/modules/bepasty/data/etc/apache2/conf-available/bepasty-freedombox.conf b/plinth/modules/bepasty/data/usr/share/freedombox/etc/apache2/conf-available/bepasty-freedombox.conf similarity index 100% rename from plinth/modules/bepasty/data/etc/apache2/conf-available/bepasty-freedombox.conf rename to plinth/modules/bepasty/data/usr/share/freedombox/etc/apache2/conf-available/bepasty-freedombox.conf diff --git a/plinth/modules/bepasty/data/etc/uwsgi/apps-available/bepasty-freedombox.ini b/plinth/modules/bepasty/data/usr/share/freedombox/etc/uwsgi/apps-available/bepasty-freedombox.ini similarity index 100% rename from plinth/modules/bepasty/data/etc/uwsgi/apps-available/bepasty-freedombox.ini rename to plinth/modules/bepasty/data/usr/share/freedombox/etc/uwsgi/apps-available/bepasty-freedombox.ini