unify user+nginx into machines

web/app.py

@@ -14,11 +14,24 @@ def turn_me_to_json(cursor,res):
         out.append(v)
     return out
 
+@route('/machines/', method='GET')
+def get_machines(db):
+    c = db.execute('SELECT mgroup,name,ip FROM machines')
+    out = turn_me_to_json(c,c.fetchall())
+    response.content_type = "application/json"
+    return json.dumps(out)
+
+@route('/machines/<group>/<name>/<ip>', method='PUT')
+def put_machines(db, group, name, ip):
+    c = db.execute('UPDATE machines set mgroup=? and name=? where ip=?', (group,name,ip))
+    if c.rowcount == 0:
+        c = db.execute('INSERT INTO machines (mgroup,name,ip) values(?,?,?)', (group,name,ip))
 
 @route('/domain/', method='GET')
 def get_domains(db):
     c = db.execute('SELECT ip,port,domain,subdomain FROM domains')
     out = turn_me_to_json(c,c.fetchall())
+    response.content_type = "application/json"
     return json.dumps(out)
 
 @route('/domain/<ip>', method='PUT')
@@ -32,43 +45,4 @@ def put_domain(db, ip="Mystery Domain" ):
         c = db.execute('INSERT INTO user_machines (ip,name) values(?,?)', (request.json["ip"],name))
     return 
 
-@route('/user/', method='GET')
-def get_users(db):
-    c = db.execute('SELECT name, ip FROM user_machines')
-    out = turn_me_to_json(c,c.fetchall())
-    return json.dumps(out)
-
-@route('/user/<name>', method='PUT')
-def put_users(db, name="Mystery User" ):
-    if request.json is None or "ip" not in request.json:
-        response.status=400
-        return
-    if len(request.json["ip"]) < 7:
-        response.status=400
-        return
-    c = db.execute('UPDATE user_machines set ip=? where name=?', (request.json["ip"],name))
-    if c.rowcount == 0:
-        c = db.execute('INSERT INTO user_machines (ip,name) values(?,?)', (request.json["ip"],name))
-    return 
-
-
-@route('/nginx/', method='GET')
-def get_nginx(db):
-    c = db.execute('SELECT name, ip FROM nginx')
-    out = turn_me_to_json(c,c.fetchall())
-    return json.dumps(out)
-
-@route('/nginx/<name>', method='PUT')
-def put_nginx(db, name="Mystery Host" ):
-    if request.json is None or "ip" not in request.json:
-        response.status=400
-        return
-    if len(request.json["ip"]) < 7:
-        response.status=400
-        return
-    c = db.execute('UPDATE nginx set ip=? where name=?', (request.json["ip"],name))
-    if c.rowcount == 0:
-        c = db.execute('INSERT INTO nginx (ip,name) values(?,?)', (request.json["ip"],name))
-    return 
-
 run(host='localhost', port=8080)