README.md

 # Projektbeschreibung 
 
 s. Wiki: https://wiki.warpzone.ms/infrastruktur:warpinfra
-
+  
+  
\ No newline at end of file

www/Dockerfile

-From debian:jessie
+From debian:buster
 
 # Common Packages
 RUN apt-get update && apt-get install -y \
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
     gettext \
     git \
     nginx \
-    libmysqlclient-dev
+    libmariadb-dev
 
 # Python Packages
 RUN apt-get update && apt-get install -y \

www/nginx/uwsgi.ini

@@ -4,7 +4,7 @@ module=warpzone.wsgi:application
 master=True
 pidfile=/tmp/warpinfra.pid
 vacuum=True
-socket=/opt/socket/warpinfra.sock
+http=0.0.0.0:8080
 max-requests=5000
 daemonize=/var/log/uwsgi.log
 processes       = 10

www/web/warpapi/views.py

@@ -3,6 +3,24 @@ from rest_framework.response import Response
 from rest_framework import status
 from warpapi.models import Information
 
+# Beispieldaten aus Konfigurationstabelle 
+# INSERT INTO "warpapi_information" VALUES(1,'api','','0.13');
+# INSERT INTO "warpapi_information" VALUES(2,'space','','warpzone');
+# INSERT INTO "warpapi_information" VALUES(3,'logo','','https://www.warpzone.ms/api/warpzone_logo.png');
+# INSERT INTO "warpapi_information" VALUES(4,'url','','https://www.warpzone.ms');
+# INSERT INTO "warpapi_information" VALUES(5,'address','location','warpzone e.V., Am Hawerkamp 31, 48155 Muenster, Germany');
+# INSERT INTO "warpapi_information" VALUES(6,'lon','location','7.638216');
+# INSERT INTO "warpapi_information" VALUES(7,'lat','location','51.943376');
+# INSERT INTO "warpapi_information" VALUES(8,'phone','contact','+49 251 39500271');
+# INSERT INTO "warpapi_information" VALUES(9,'twitter','contact','@warpzone_ms');
+# INSERT INTO "warpapi_information" VALUES(10,'email','contact','office@warpzone.ms');
+# INSERT INTO "warpapi_information" VALUES(11,'irc','contact','irc://irc.freenode.net/#warpzone');
+# INSERT INTO "warpapi_information" VALUES(12,'ml','contact','warpzone@warpzone.ms');
+# INSERT INTO "warpapi_information" VALUES(13,'issue_mail','contact','c3BhY2VhcGlAd2FycHpvbmUubXM=');
+# INSERT INTO "warpapi_information" VALUES(14,'open','icon','https://www.warpzone.ms/api/warpzone_open.png');
+# INSERT INTO "warpapi_information" VALUES(15,'closed','icon','https://www.warpzone.ms/api/warpzone_closed.png');
+# INSERT INTO "warpapi_information" VALUES(16,'issue_mail','issue_report_channels','');
+
 @api_view(['GET'])
 def main(request):
     ret= {}

www/web/warpauth/models.py

@@ -39,7 +39,9 @@ class LdapUser(ldapdb.models.Model):
     cn = CharField(db_column='cn', max_length=200)
     card_id = CharField(db_column='employeeNumber', max_length=200)
     pinCode = CharField(db_column='carLicense', max_length=100)
-
+    memberof = ListField(db_column='memberOf')
+    
+    
     def __str__(self):
         return self.uid
 

www/web/warppay/models.py

@@ -54,9 +54,9 @@ class TransactionLog(models.Model):
 
 class UserCredit(models.Model):
     uid = models.CharField(max_length=100,unique=True)
-    card_id = models.CharField(max_length=10, null=True) # Unique only with django 1.11
+    card_id = models.CharField(max_length=255, null=True, blank=True) # Unique only with django 1.11
     credit = models.FloatField()
-    pinCode = models.CharField(max_length=100, null=True)
+    pinCode = models.CharField(max_length=100, blank=True, null=True)
 
     def __str__(self):
         return self.uid

www/web/warpservice/admin.py

+from django.contrib import admin
+

www/web/warpservice/apps.py

+from django.apps import AppConfig
+
+
+class WarpmainConfig(AppConfig):
+    name = 'warpservice'

www/web/warpservice/models.py

+from django.db import models

www/web/warpservice/tests.py

+from django.test import TestCase
+
+# Create your tests here.

www/web/warpservice/urls.py

+from django.conf.urls import url, include
+from warpservice import views
+
+urlpatterns = [
+    url(r'^api/services/3dprinter$', views.printer_3d),
+
+]

www/web/warpservice/views.py

+from rest_framework.decorators import api_view
+from rest_framework.response import Response
+from rest_framework import status
+from warpauth.models import LdapUser
+
+@api_view(['GET'])
+def printer_3d(request):
+    ret= {"admin":{}, "user":{}}
+    users = LdapUser.objects.filter(memberof__contains="cn=3dprint-user,ou=infrastructure,dc=warpzone,dc=ms").filter(memberof__contains="cn=active,ou=groups,dc=warpzone,dc=ms")
+    for user in users:
+        if user.card_id:
+            ret["user"][user.card_id] = user.uid
+    return Response(ret)
+

www/web/warpzone/urls.py

@@ -23,3 +23,6 @@ if "warpapi" in settings.INSTALLED_APPS:
 
 if "warppay" in settings.INSTALLED_APPS:
     urlpatterns.append(url(r'^', include('warppay.urls')))
+
+if "warpservice" in settings.INSTALLED_APPS:
+    urlpatterns.append(url(r'^', include('warpservice.urls')))