improved dput configuration

debomatic-webui/lib/config.js

@@ -29,7 +29,7 @@ config.routes.distribution = '/distribution'
 config.routes.preferences = '/preferences'
 
 config.web = {}
-config.web.title = "deb-o-matic web.ui"
+config.web.title = "Deb-o-Matic web.ui"
 config.web.description = "This is a web interface for debomatic"
 
 // debomatic configuration exportable for web
@@ -37,9 +37,15 @@ config.web.debomatic = {}
 config.web.debomatic.admin = {}
 config.web.debomatic.admin.name = "Your Name"
 config.web.debomatic.admin.email = "you AT debian DOT org" // please use this SPAMFREE form - it will be converted client side by javascript
-config.web.debomatic.incoming = config.debomatic.path
 config.web.debomatic.architecture = 'amd64'
 
+config.web.debomatic.dput = {}
+config.web.debomatic.dput.incoming = config.debomatic.path
+config.web.debomatic.dput.host = config.host
+config.web.debomatic.dput.login = "debomatic"
+config.web.debomatic.dput.method = "scp"
+config.web.debomatic.dput.unsigned_uploads = true
+
 // default ui settings
 config.web.preferences = {}
 config.web.preferences.autoscroll = true
@@ -80,7 +86,7 @@ config.events.client.file = _event_get_set('file')
 config.events.client.file_newcontent = 'file_newcontent'
 config.events.client.status = 'status'
 
-// packages status according with debomatic.json file
+// packages status according with JSONLogger.py module
 config.status = {}
 config.status.package = {}
 config.status.package.building = 'building'

debomatic-webui/views/index.ejs

@@ -27,7 +27,7 @@
           <h3 class="panel-title">Account Request</h3>
         </div>
         <div class="panel-body">
-          <p>For build account requests please mail <span subject="Build account request for <%= web.host %>" class="email"><%= web.debomatic.admin.email %></span>.</p>
+          <p>For build account requests please mail <span subject="Build account request for <%= web.debomatic.dput.host %>" class="email"><%= web.debomatic.admin.email %></span>.</p>
         </div>
       </div>
 
@@ -51,12 +51,12 @@
               </div>
               <div class="panel-body">
                 <pre>
-[debomatic-<%= web.debomatic.architecture %>]
-fqdn           = <%= web.host %>
-incoming       = <%= web.debomatic.incoming %>
-login          = debomatic
-method         = scp
-allow_unsigned_uploads  = 0
+[debomatic-<%=       web.debomatic.architecture %>]
+fqdn           = <%= web.debomatic.dput.host %>
+incoming       = <%= web.debomatic.dput.incoming %>
+login          = <%= web.debomatic.dput.login %>
+method         = <%= web.debomatic.dput.method %>
+allow_unsigned_uploads  = <%= web.debomatic.dput.unsigned_uploads ? '1' : '0' %>
 allow_dcut     = 1
 scp_compress   = 1
 
@@ -77,10 +77,10 @@ scp_compress   = 1
 {
     "allow_dcut": true,
     "meta": "debomatic",
-    "fqdn": "<%= web.host %>",
-    "incoming": "<%= web.debomatic.incoming %>",
-    "login": "debomatic",
-    "method": "scp",
+    "fqdn": "<%=      web.debomatic.dput.host %>",
+    "incoming": "<%=  web.debomatic.dput.incoming %>",
+    "login": "<%=     web.debomatic.dput.login %>",
+    "method": "<%=    web.debomatic.dput.method %>",
     "check-debs": { "skip": true }
 }</pre>
               </div>