Split RESESRVED_USERNAMES list #551

- Have each module declare its own reserved_usernames list

plinth/modules/deluge/__init__.py

@@ -49,6 +49,7 @@ description = [
       'it immediately after enabling this service.')
 ]
 
+reserved_usernames = ['debian-deluged']
 
 def init():
     """Initialize the Deluge module."""

plinth/modules/dynamicdns/__init__.py

@@ -50,6 +50,7 @@ description = [
       'name, they will get a response with your current IP address.')
 ]
 
+reserved_usernames = ['ez-ipupd']
 
 def init():
     """Initialize the module."""

plinth/modules/ejabberd/__init__.py

@@ -52,6 +52,8 @@ description = [
       '>XMPP client</a>.'),
 ]
 
+reserved_usernames = ['ejabberd']
+
 service = None
 
 logger = logging.getLogger(__name__)

plinth/modules/minetest/__init__.py

@@ -57,6 +57,8 @@ description = [
           'is needed.'), box_name=_(cfg.box_name)),
 ]
 
+reserved_usernames = ['Debian-minetest']
+
 CONFIG_FILE = '/etc/minetest/minetest.conf'
 AUG_PATH = '/files' + CONFIG_FILE + '/.anon'
 

plinth/modules/monkeysphere/__init__.py

@@ -51,6 +51,8 @@ description = [
       'website</a>.')
 ]
 
+reserved_usernames = ['monkeysphere']
+
 
 def init():
     """Initialize the monkeysphere module."""

plinth/modules/mumble/__init__.py

@@ -51,6 +51,8 @@ description = [
       'from your desktop and Android devices are available.')
 ]
 
+reserved_usernames = ['mumble-server']
+
 
 def init():
     """Intialize the Mumble module."""

plinth/modules/privoxy/__init__.py

@@ -59,6 +59,8 @@ description = [
         box_name=_(cfg.box_name)),
 ]
 
+reserved_usernames = ['privoxy']
+
 service = None
 
 

plinth/modules/quassel/__init__.py

@@ -59,6 +59,8 @@ description = [
       'are available.'),
 ]
 
+reserved_usernames = ['quasselcore']
+
 
 def init():
     """Initialize the quassel module."""

plinth/modules/radicale/__init__.py

@@ -52,6 +52,8 @@ description = [
           'login.'), box_name=_(cfg.box_name)),
 ]
 
+reserved_usernames = ['radicale']
+
 CONFIG_FILE = '/etc/radicale/config'
 
 

plinth/modules/repro/__init__.py

@@ -59,9 +59,10 @@ description = [
       'service and re-enable it.'),
 ]
 
+reserved_usernames = ['repro']
+
 service = None
 
-reserved_usernames = ['repro']
 
 def init():
     """Initialize the repro module."""

plinth/modules/restore/__init__.py

@@ -49,6 +49,8 @@ description = [
       '<a href=\'/restore/\'>reStore web-interface</a>.')
 ]
 
+reserved_usernames = ['node-restores']
+
 service = None
 
 

plinth/modules/tor/__init__.py

@@ -50,6 +50,8 @@ description = [
       'Tor Browser</a>.')
 ]
 
+reserved_usernames = ['debian-tor']
+
 socks_service = None
 bridge_service = None
 

plinth/modules/transmission/__init__.py

@@ -46,6 +46,8 @@ description = [
     _('Access the web interface at <a href="/transmission">/transmission</a>.')
 ]
 
+reserved_usernames = ['debian-transmission']
+
 service = None