diff --git a/data/etc/apache2/conf-available/syncthing-plinth.conf b/data/etc/apache2/conf-available/syncthing-plinth.conf index 8cdb35b6a..fe244792e 100644 --- a/data/etc/apache2/conf-available/syncthing-plinth.conf +++ b/data/etc/apache2/conf-available/syncthing-plinth.conf @@ -11,4 +11,3 @@ ProxyPass /syncthing/ http://localhost:8384/ Require valid-user - diff --git a/plinth/modules/syncthing/__init__.py b/plinth/modules/syncthing/__init__.py index f4e727019..6249297a9 100644 --- a/plinth/modules/syncthing/__init__.py +++ b/plinth/modules/syncthing/__init__.py @@ -32,7 +32,7 @@ version = 1 depends = ['apps'] -managed_services = ['syncthing'] +managed_services = ['syncthing@syncthing.service'] managed_packages = ['syncthing'] @@ -46,8 +46,6 @@ description = [ '/syncthing path on the web server.'), ] -service = None - def init(): """Intialize the module.""" @@ -96,7 +94,7 @@ def add_shortcut(): def is_enabled(): """Return whether the module is enabled.""" - return (action_utils.service_is_enabled('syncthing@plinth.service') and + return (action_utils.service_is_running('syncthing@syncthing.service') and action_utils.webserver_is_enabled('syncthing-plinth'))