136 changed files with 2071 additions and 2978 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,13 +1,4 @@
 .env
-.venv
-source/static/css/font-awesome.min.css
-source/static/js/bootstrap.bundle.min.js
-source/static/js/jquery.min.js
-source/static/js/vue.min.js
-source/static/js/axios.min.js
-source/static/fonts
-
-source/staticfiles

 # Byte-compiled / optimized / DLL files
 __pycache__/
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,10 @@
+language: python
+python:
+  - "3.7"
+  - "3.8"
+install:
+  - pip install -r requirements.txt
+  - pip install flake8
+script:
+  - flake8
+  - ./manage.py test
--- a/15
+++ b/15
@ -1,4 +1,4 @@
-FROM python:3.12-alpine
+FROM python:3.8-alpine
 WORKDIR /app

 # set env
@ -9,26 +9,19 @@ ENV PYTHONUNBUFFERED 1
 RUN apk add --no-cache postgresql-dev gcc python3-dev musl-dev gettext postgresql-client nginx supervisor

 # install dependencies
-ADD ./source/requirements.txt .
+ADD ./requirements.txt .
 RUN pip install -r requirements.txt

 # add supervisor and nginx configs
 ADD ./docker/nginx.conf /etc/nginx/nginx.conf
-ADD ./docker/supervisor*.conf /etc/
+ADD ./docker/supervisord.conf /etc/supervisord.conf

 # add user
 RUN addgroup -S portier && adduser -S portier -G portier

 # add code
-ADD --chown=portier:portier ./source/ /app/
-
-# add static external libraries for frontend
-RUN ./fetch_frontend_libs.sh \
-    && chown -R portier:portier static/
-
-# collect static files and compile localized strings
+ADD --chown=portier:portier . /app
 RUN ./manage.py collectstatic --noinput --link
 RUN ./manage.py compilemessages

-ENV COMPONENT=web
 CMD ["/app/start.sh"]
--- a/340
+++ b/340
@ -1,7 +1,339 @@
-Copyright 2024 Jan Koppe
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991

-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+                            Preamble

-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- a/README.md
+++ b/README.md
@ -1,33 +1,4 @@
+[![Docker Repository on Quay](https://quay.io/repository/cwtv/portier/status "Docker Repository on Quay")](https://quay.io/repository/cwtv/portier)
+[![Travis Pipelines](https://api.travis-ci.org/chaoswest-tv/portier.svg?branch=master&status=failed)](https://travis-ci.org/github/chaoswest-tv/portier)
+
 # Portier
-
-Portier is a webservice that manages video streaming authorization for [SRS](https://github.com/ossrs/srs) and orchestration of surrounding video streaming functions like restreaming, pulling, and recording.
-
-It is based on the Django web framework, and accompanied by [concierge](https://git.chaoswest.tv/cwtv/concierge), a simple Python agent which will execute the surrounding video streaming functions.
-
-## Status
-
-So far I only know of ourselves (Chaos-West TV) as using this software, so it is not yet considered stable. We are using it in production, but we are also actively developing it. Functionality might radically change and break existing workflows, and we might not be able to provide support for it if you chose to run your own instance. However, if you are interested in using it, we are happy to hear from you and help you get started.
-
-## Functionality
-
-* User management based on Djangos built-in user management
-* Authorization of video streaming requests
-    * Callbacks from SRS to authorize incoming streams
-* Orchestration of video streaming functions
-    * Restreaming to remote targets (RTMP, SRT)
-
-### Planned functionality
-
-* Planned: Analyze incoming streams for quality and health
-* Planned: Pulling from remote sources (RTMP, SRT)
-* Planned: Recording of streams to an object storage
-* Planned: Transcoding of streams and delivery via HLS
-* Planned: Switching of streams for MCR functionality
-
-### Non-goals
-
-Right now, it is not planned to extend this into some kind of streaming platform like Tw*tch or others. This is a tool to manage and orchestrate video streaming for a specific use case. Think of it as a backoffice swiss-army knife, which we internally use almost always when we are dealing with video streaming to take care of the boring stuff.
-
-## License
-
-This software is licensed under the MIT License. See the `LICENSE` file for details.
--- a/source/concierge/init.py
+++ b/source/concierge/init.py
--- a/source/concierge/admin.py
+++ b/source/concierge/admin.py
@ -2,13 +2,13 @@ from django.contrib import admin
 from .models import Identity, Task


-@admin.register(Identity)
 class IdentityAdmin(admin.ModelAdmin):
    fields = ['identity', 'name', 'notes', 'heartbeat']


-@admin.register(Task)
 class TaskAdmin(admin.ModelAdmin):
-    fields = ['stream', 'type', 'config_id', 'configuration', 'claimed_by']
+    fields = ['stream', 'type', 'configuration', 'claimed_by']


+admin.site.register(Identity, IdentityAdmin)
+admin.site.register(Task, TaskAdmin)
--- a/source/concierge/apps.py
+++ b/source/concierge/apps.py
--- a/source/concierge/migrations/0001_initial.py
+++ b/source/concierge/migrations/0001_initial.py
@ -1,8 +1,8 @@
-# Generated by Django 5.0.2 on 2024-02-27 19:20
+# Generated by Django 3.0.5 on 2020-04-26 17:25

+from django.db import migrations, models
 import django.db.models.deletion
 import uuid
-from django.db import migrations, models


 class Migration(migrations.Migration):
@ -10,7 +10,7 @@ class Migration(migrations.Migration):
    initial = True

    dependencies = [
-        ('config', '0001_initial'),
+        ('rtmp', '0002_stream_publish_counter'),
    ]

    operations = [
@ -18,22 +18,27 @@ class Migration(migrations.Migration):
            name='Identity',
            fields=[
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('identity', models.UUIDField(default=uuid.uuid4, unique=True)),
+                ('identity', models.CharField(default=uuid.uuid4, max_length=36, unique=True)),
                ('name', models.CharField(max_length=100)),
-                ('notes', models.TextField(blank=True)),
-                ('heartbeat', models.DateTimeField(blank=True, null=True)),
+                ('notes', models.TextField()),
+                ('heartbeat', models.DateTimeField(blank=True)),
            ],
        ),
        migrations.CreateModel(
            name='Task',
            fields=[
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('uuid', models.UUIDField(default=uuid.uuid4, unique=True)),
                ('type', models.CharField(max_length=100)),
-                ('config_id', models.IntegerField()),
                ('configuration', models.TextField()),
-                ('claimed_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='concierge.identity')),
-                ('stream', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='config.stream')),
+                ('stream', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rtmp.Stream')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Claim',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='concierge.Identity')),
+                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='concierge.Task')),
            ],
        ),
    ]
--- a/concierge/migrations/0002_auto_20200426_1834.py
+++ b/concierge/migrations/0002_auto_20200426_1834.py
@ -0,0 +1,19 @@
+# Generated by Django 3.0.5 on 2020-04-26 18:34
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('concierge', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='claim',
+            name='id',
+            field=models.CharField(default=uuid.uuid4, max_length=36, primary_key=True, serialize=False, unique=True),
+        ),
+    ]
--- a/concierge/migrations/0003_auto_20200426_1835.py
+++ b/concierge/migrations/0003_auto_20200426_1835.py
@ -0,0 +1,23 @@
+# Generated by Django 3.0.5 on 2020-04-26 18:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('concierge', '0002_auto_20200426_1834'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='identity',
+            name='heartbeat',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='identity',
+            name='notes',
+            field=models.TextField(blank=True),
+        ),
+    ]
--- a/concierge/migrations/0004_auto_20200426_1912.py
+++ b/concierge/migrations/0004_auto_20200426_1912.py
@ -0,0 +1,28 @@
+# Generated by Django 3.0.5 on 2020-04-26 19:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('concierge', '0003_auto_20200426_1835'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='claimed_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='concierge.Identity'),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='uuid',
+            field=models.UUIDField(default=uuid.uuid4, serialize=False, unique=True),
+        ),
+        migrations.DeleteModel(
+            name='Claim',
+        ),
+    ]
--- a/concierge/migrations/0005_auto_20200426_2007.py
+++ b/concierge/migrations/0005_auto_20200426_2007.py
@ -0,0 +1,30 @@
+# Generated by Django 3.0.5 on 2020-04-26 20:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('concierge', '0004_auto_20200426_1912'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='identity',
+            name='identity',
+            field=models.UUIDField(default=uuid.uuid4, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='claimed_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='concierge.Identity'),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='uuid',
+            field=models.UUIDField(default=uuid.uuid4, unique=True),
+        ),
+    ]
--- a/source/concierge/migrations/init.py
+++ b/source/concierge/migrations/init.py
--- a/source/concierge/models.py
+++ b/source/concierge/models.py
@ -1,6 +1,6 @@
 import uuid
 from django.db import models
-from config.models import Stream
+from rtmp.models import Stream


 class Identity(models.Model):
@ -21,6 +21,5 @@ class Task(models.Model):
    uuid = models.UUIDField(unique=True, default=uuid.uuid4)
    stream = models.ForeignKey(Stream, on_delete=models.CASCADE)
    type = models.CharField(max_length=100)
-    config_id = models.IntegerField()
    configuration = models.TextField()
    claimed_by = models.ForeignKey(Identity, null=True, blank=True, on_delete=models.CASCADE)
--- a/concierge/signals.py
+++ b/concierge/signals.py
@ -0,0 +1,11 @@
+from django.dispatch import receiver
+from rtmp.signals import stream_inactive
+from .models import Task
+from rtmp.models import Stream
+
+
+@receiver(stream_inactive)
+def delete_tasks(sender, **kwargs):
+    # when a stream was unpublished, all related tasks need to be deleted.
+    stream = Stream.objects.get(stream=kwargs['stream'])
+    Task.objects.filter(stream=stream).delete()
--- a/concierge/tests.py
+++ b/concierge/tests.py
@ -0,0 +1,3 @@
+from django.test import TestCase  # noqa
+
+# Create your tests here.
--- a/concierge/urls.py
+++ b/concierge/urls.py
@ -0,0 +1,8 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    path('api/<uuid:identity>/heartbeat', views.heartbeat, name='heartbeat'),
+    path('api/<uuid:identity>/claim/<uuid:task_uuid>', views.claim, name='claim'),
+    path('api/<uuid:identity>/release/<uuid:task_uuid>', views.release, name='release'),
+]
--- a/concierge/views.py
+++ b/concierge/views.py
@ -0,0 +1,94 @@
+import json
+
+from django.db import transaction
+from django.http import JsonResponse
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.http import require_POST
+from django.core.exceptions import ObjectDoesNotExist
+from django.utils.timezone import now
+
+from .models import Identity, Task
+
+
+@csrf_exempt
+@require_POST
+def heartbeat(request, identity):
+    try:
+        id = Identity.objects.get(identity=identity)
+    except ObjectDoesNotExist:
+        return JsonResponse({'error': 'identity unknown'}, status=403)
+
+    # update heartbeat
+    id.heartbeat = now()
+    id.save()
+
+    # get current claims and available tasks
+    claims = Task.objects.filter(claimed_by=id).all()
+    available = Task.objects.filter(claimed_by=None).all()
+
+    data = {
+        'success': True,
+        'claims': [{'uuid': str(o.uuid)} for o in list(claims)],
+        'available': [{'uuid': str(o.uuid), 'type': o.type} for o in list(available)],
+    }
+
+    return JsonResponse(data)
+
+
+@csrf_exempt
+@require_POST
+def claim(request, identity, task_uuid):
+    try:
+        id = Identity.objects.get(identity=identity)
+    except ObjectDoesNotExist:
+        return JsonResponse({'error': 'identity unknown'}, status=403)
+
+    with transaction.atomic():
+        try:
+            task = Task.objects.get(uuid=task_uuid)
+        except ObjectDoesNotExist:
+            return JsonResponse({'error': 'task unknown'}, status=404)
+
+        if task.claimed_by:
+            return JsonResponse({'error': 'task already claimed'}, status=423)
+
+        task.claimed_by = id
+        task.save()
+
+        data = {
+            'success': True,
+            'uuid': task.uuid,
+            'type': task.type,
+            'configuration': json.loads(task.configuration)
+        }
+
+        return JsonResponse(data)
+
+
+@csrf_exempt
+@require_POST
+def release(request, identity, task_uuid):
+    try:
+        id = Identity.objects.get(identity=identity)
+    except ObjectDoesNotExist:
+        return JsonResponse({'error': 'identity unknown'}, status=403)
+
+    with transaction.atomic():
+        try:
+            task = Task.objects.get(uuid=task_uuid)
+        except ObjectDoesNotExist:
+            return JsonResponse({'error': 'task unknown'}, status=404)
+
+        if task.claimed_by != id:
+            return JsonResponse({'error': 'task claimed by other identity'}, status=403)
+
+        task.claimed_by = None
+        task.save()
+
+        data = {
+            'success': True,
+            'uuid': task.uuid,
+            'type': task.type,
+        }
+
+        return JsonResponse(data)
--- a/source/config/init.py
+++ b/source/config/init.py
--- a/source/core/apps.py
+++ b/source/core/apps.py
@ -1,6 +1,5 @@
 from django.apps import AppConfig

-
 class CoreConfig(AppConfig):
    name = 'core'

--- a/source/core/management/commands/createdefaultgroup.py
+++ b/source/core/management/commands/createdefaultgroup.py
@ -5,7 +5,7 @@ from django.conf import settings

 PERMISSIONS = [
    'add_stream',
-    'add_restream'
+    'add_restreamconfig'
 ]


--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@ -0,0 +1,33 @@
+version: '2.4'
+
+services:
+  app:
+    build: .
+    ports:
+      - 80:80
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - DEBUG=1
+      - "SECRET_KEY=D4mn1t_Ch4nG3_M3!1!!"
+      - SQL_ENGINE=django.db.backends.postgresql
+      - SQL_USER=portier
+      - SQL_PASSWORD=portier
+      - SQL_DATABASE=portier
+      - SQL_HOST=postgres
+      - SQL_PORT=5432
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - "EMAIL_FROM=${EMAIL_FROM}"
+      - "EMAIL_HOST=${EMAIL_HOST}"
+      - "EMAIL_HOST_USER=${EMAIL_HOST_USER}"
+      - "EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}"
+  redis:
+    image: redis:5-alpine
+  postgres:
+    image: postgres:11.7-alpine
+    environment:
+      POSTGRES_PASSWORD: "portier"
+      POSTGRES_USER: "portier"
+      POSTGRES_DB: "portier"
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -1,61 +0,0 @@
-version: '2.4'
-
-services:
-  app:
-    build: .
-    ports:
-      - 80:80
-    depends_on:
-      - postgres
-      - redis
-    environment:
-      - DEBUG=1
-      - "SECRET_KEY=D4mn1t_Ch4nG3_M3!1!!"
-      - SQL_ENGINE=django.db.backends.postgresql
-      - SQL_USER=portier
-      - SQL_PASSWORD=portier
-      - SQL_DATABASE=portier
-      - SQL_HOST=postgres
-      - SQL_PORT=5432
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-      - "EMAIL_FROM=${EMAIL_FROM}"
-      - "EMAIL_HOST=${EMAIL_HOST}"
-      - "EMAIL_HOST_USER=${EMAIL_HOST_USER}"
-      - "EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}"
-  celerybeat:
-    build: .
-    depends_on:
-      - postgres
-      - redis
-    environment:
-      - COMPONENT=celerybeat
-      - DEBUG=1
-      - "SECRET_KEY=D4mn1t_Ch4nG3_M3!1!!"
-      - SQL_ENGINE=django.db.backends.postgresql
-      - SQL_USER=portier
-      - SQL_PASSWORD=portier
-      - SQL_DATABASE=portier
-      - SQL_HOST=postgres
-      - SQL_PORT=5432
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-      - "EMAIL_FROM=${EMAIL_FROM}"
-      - "EMAIL_HOST=${EMAIL_HOST}"
-      - "EMAIL_HOST_USER=${EMAIL_HOST_USER}"
-      - "EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}"
-  redis:
-    image: redis:7-alpine
-  postgres:
-    image: postgres:16-alpine
-    environment:
-      POSTGRES_PASSWORD: "portier"
-      POSTGRES_USER: "portier"
-      POSTGRES_DB: "portier"
-  srs:
-    image: ossrs/srs:6
-    ports:
-      - 1935:1935
-      - 8888:8888
-    volumes:
-      - ./srs.conf:/usr/local/srs/conf/docker.conf:ro
--- a/docker/supervisord-celerybeat.conf
+++ b/docker/supervisord-celerybeat.conf
@ -1,21 +0,0 @@
-[supervisord]
-logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log)
-logfile_maxbytes=50MB        ; (max main logfile bytes b4 rotation;default 50MB)
-logfile_backups=10           ; (num of main logfile rotation backups;default 10)
-loglevel=info                ; (log level;default info; others: debug,warn,trace)
-nodaemon=true                ; (start in foreground if true;default false)
-user=root
-
-[program:celery_beat]
-directory=/app
-command=/usr/local/bin/celery -A portier beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
-autostart=true
-autorestart=true
-priority=5
-stdout_events_enabled=true
-stderr_events_enabled=true
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-user=portier
--- a/docker/supervisord-web.conf
+++ b/docker/supervisord-web.conf
@ -6,23 +6,9 @@ loglevel=info                ; (log level;default info; others: debug,warn,trace
 nodaemon=true                ; (start in foreground if true;default false)
 user=root

-[program:celery_worker]
-directory=/app
-command=/usr/local/bin/celery -A portier worker -l INFO
-autostart=true
-autorestart=true
-priority=5
-stdout_events_enabled=true
-stderr_events_enabled=true
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-user=portier
-
 [program:gunicorn]
 directory=/app
-command=/usr/local/bin/gunicorn -w 4 --bind 0.0.0.0:8000 portier.wsgi
+command=/usr/local/bin/gunicorn -w 4 --bind 127.0.0.1:8000 portier.wsgi
 autostart=true
 autorestart=true
 priority=5
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@ -0,0 +1,297 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-05-01 12:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: restream/models.py:11
+msgid "restreamconfig_stream_help"
+msgstr ""
+
+#: restream/models.py:12
+msgid "restreamconfig_target_help"
+msgstr ""
+
+#: restream/models.py:13
+msgid "restreamconfig_name_help"
+msgstr ""
+
+#: restream/models.py:14
+msgid "restreamconfig_activate_help"
+msgstr ""
+
+#: restream/models.py:17
+msgid "restreamconfig_verbose_name"
+msgstr ""
+
+#: restream/models.py:18
+msgid "restreamconfig_verbose_name_plural"
+msgstr ""
+
+#: restream/models.py:21
+msgid "restreamconfig_class_name"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_confirm_delete.html:6
+#: rtmp/templates/rtmp/stream_confirm_delete.html:6
+msgid "confirm_delete_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_confirm_delete.html:12
+#, python-format
+msgid "are_you_sure_you_want_to_delete_\"%(restreamconfig_config_name)s\"?"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_confirm_delete.html:15
+#: restream/templates/restream/restreamconfig_detail.html:20
+#: rtmp/templates/rtmp/stream_confirm_delete.html:18
+#: rtmp/templates/rtmp/stream_detail.html:20
+msgid "delete"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:12
+msgid "restreamconfig_configuration_details_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:17
+#: rtmp/templates/rtmp/stream_detail.html:17
+msgid "change"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:28
+#: restream/templates/restream/restreamconfig_list.html:18
+#: rtmp/templates/rtmp/stream_detail.html:28
+#: rtmp/templates/rtmp/stream_list.html:18
+msgid "name"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:30
+msgid "stream"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:35
+msgid "configured_target_url"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_form.html:5
+msgid "create_new_restreamconfig_configuration_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_form.html:14
+#: restream/templates/restream/restreamconfig_update_form.html:14
+#: rtmp/templates/rtmp/stream_form.html:14
+#: rtmp/templates/rtmp/stream_update_form.html:14
+#: templates/registration/password_change_form.html:13
+#: templates/registration/password_reset_form.html:13
+msgid "submit"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_form.html:21
+msgid "create_new_restreamconfig_configuration_text_html"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:8
+msgid "restreamconfig_configuration_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:12
+#: rtmp/templates/rtmp/stream_list.html:12
+msgid "create"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:19
+msgid "active"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:20
+#: rtmp/templates/rtmp/stream_list.html:20
+msgid "actions"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:38
+#: rtmp/templates/rtmp/stream_list.html:38
+msgid "details"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_update_form.html:5
+msgid "update_restreamconfig_configuration_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_update_form.html:21
+msgid "update_restreamconfig_configuration_text_html"
+msgstr ""
+
+#: rtmp/models.py:13
+msgid "rtmp_application_name"
+msgstr ""
+
+#: rtmp/models.py:16
+msgid "application_verbose_name"
+msgstr ""
+
+#: rtmp/models.py:17
+msgid "application_verbose_name_plural"
+msgstr ""
+
+#: rtmp/models.py:20
+msgid "aplication_class_name"
+msgstr ""
+
+#: rtmp/models.py:27
+msgid "stream_application_help"
+msgstr ""
+
+#: rtmp/models.py:28
+msgid "stream_stream_help"
+msgstr ""
+
+#: rtmp/models.py:29
+msgid "stream_name_help"
+msgstr ""
+
+#: rtmp/models.py:68
+msgid "stream_class_name"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_confirm_delete.html:13
+msgid "deleting_stream_configuration_will_also_delete_all_depending_confgurations_warning"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_confirm_delete.html:15
+#, python-format
+msgid "are_you_sure_you_want_to_delete_\"%(stream_config_name)s\"?"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_confirm_delete.html:25
+msgid "deleting_configurations_list_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:12
+msgid "stream_configuration_details_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:30
+msgid "application"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:33
+msgid "stream_configuration_do_not_share_warning"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:36
+msgid "how_to_configure_your_encoder_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:38
+msgid "set_this_stream_server_in_encoder"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:40
+msgid "set_this_stream_id_in_encoder"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:48
+msgid "you_may_need_to_use_this_full_url_instead"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_form.html:5
+msgid "create_new_stream_configuration_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_form.html:21
+msgid "create_new_stream_configuration_text_html"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_list.html:8
+msgid "stream_configuration_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_list.html:19
+msgid "publishing"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_update_form.html:5
+msgid "update_stream_configuration_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_update_form.html:21
+msgid "update_stream_configuration_text_html"
+msgstr ""
+
+#: templates/base.html:36
+msgid "navbar_configuration"
+msgstr ""
+
+#: templates/base.html:39
+msgid "navbar_configuration_streaming_header"
+msgstr ""
+
+#: templates/base.html:40
+msgid "navbar_configuration_streams"
+msgstr ""
+
+#: templates/base.html:41
+msgid "navbar_configuration_restreams"
+msgstr ""
+
+#: templates/base.html:43
+msgid "navbar_configuration_account_header"
+msgstr ""
+
+#: templates/base.html:44
+msgid "navbar_configuration_password_change"
+msgstr ""
+
+#: templates/base.html:50
+msgid "navbar_logout"
+msgstr ""
+
+#: templates/base.html:52
+msgid "navbar_login"
+msgstr ""
+
+#: templates/registration/login.html:5 templates/registration/login.html:13
+msgid "login"
+msgstr ""
+
+#: templates/registration/login.html:18
+msgid "forgot_password_q"
+msgstr ""
+
+#: templates/registration/password_change_done.html:5
+msgid "password_change_successful"
+msgstr ""
+
+#: templates/registration/password_change_done.html:6
+msgid "password_change_successful_text"
+msgstr ""
+
+#: templates/registration/password_change_done.html:7
+msgid "take_me_to_safety"
+msgstr ""
+
+#: templates/registration/password_change_form.html:5
+msgid "change_password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:20
+msgid "change_password_text_html"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:20
+msgid "reset_password_text_html"
+msgstr ""
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@ -0,0 +1,297 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-05-01 12:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: restream/models.py:11
+msgid "restreamconfig_stream_help"
+msgstr ""
+
+#: restream/models.py:12
+msgid "restreamconfig_target_help"
+msgstr ""
+
+#: restream/models.py:13
+msgid "restreamconfig_name_help"
+msgstr ""
+
+#: restream/models.py:14
+msgid "restreamconfig_activate_help"
+msgstr ""
+
+#: restream/models.py:17
+msgid "restreamconfig_verbose_name"
+msgstr ""
+
+#: restream/models.py:18
+msgid "restreamconfig_verbose_name_plural"
+msgstr ""
+
+#: restream/models.py:21
+msgid "restreamconfig_class_name"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_confirm_delete.html:6
+#: rtmp/templates/rtmp/stream_confirm_delete.html:6
+msgid "confirm_delete_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_confirm_delete.html:12
+#, python-format
+msgid "are_you_sure_you_want_to_delete_\"%(restreamconfig_config_name)s\"?"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_confirm_delete.html:15
+#: restream/templates/restream/restreamconfig_detail.html:20
+#: rtmp/templates/rtmp/stream_confirm_delete.html:18
+#: rtmp/templates/rtmp/stream_detail.html:20
+msgid "delete"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:12
+msgid "restreamconfig_configuration_details_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:17
+#: rtmp/templates/rtmp/stream_detail.html:17
+msgid "change"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:28
+#: restream/templates/restream/restreamconfig_list.html:18
+#: rtmp/templates/rtmp/stream_detail.html:28
+#: rtmp/templates/rtmp/stream_list.html:18
+msgid "name"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:30
+msgid "stream"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_detail.html:35
+msgid "configured_target_url"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_form.html:5
+msgid "create_new_restreamconfig_configuration_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_form.html:14
+#: restream/templates/restream/restreamconfig_update_form.html:14
+#: rtmp/templates/rtmp/stream_form.html:14
+#: rtmp/templates/rtmp/stream_update_form.html:14
+#: templates/registration/password_change_form.html:13
+#: templates/registration/password_reset_form.html:13
+msgid "submit"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_form.html:21
+msgid "create_new_restreamconfig_configuration_text_html"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:8
+msgid "restreamconfig_configuration_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:12
+#: rtmp/templates/rtmp/stream_list.html:12
+msgid "create"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:19
+msgid "active"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:20
+#: rtmp/templates/rtmp/stream_list.html:20
+msgid "actions"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_list.html:38
+#: rtmp/templates/rtmp/stream_list.html:38
+msgid "details"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_update_form.html:5
+msgid "update_restreamconfig_configuration_header"
+msgstr ""
+
+#: restream/templates/restream/restreamconfig_update_form.html:21
+msgid "update_restreamconfig_configuration_text_html"
+msgstr ""
+
+#: rtmp/models.py:13
+msgid "rtmp_application_name"
+msgstr ""
+
+#: rtmp/models.py:16
+msgid "application_verbose_name"
+msgstr ""
+
+#: rtmp/models.py:17
+msgid "application_verbose_name_plural"
+msgstr ""
+
+#: rtmp/models.py:20
+msgid "aplication_class_name"
+msgstr ""
+
+#: rtmp/models.py:27
+msgid "stream_application_help"
+msgstr ""
+
+#: rtmp/models.py:28
+msgid "stream_stream_help"
+msgstr ""
+
+#: rtmp/models.py:29
+msgid "stream_name_help"
+msgstr ""
+
+#: rtmp/models.py:68
+msgid "stream_class_name"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_confirm_delete.html:13
+msgid "deleting_stream_configuration_will_also_delete_all_depending_confgurations_warning"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_confirm_delete.html:15
+#, python-format
+msgid "are_you_sure_you_want_to_delete_\"%(stream_config_name)s\"?"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_confirm_delete.html:25
+msgid "deleting_configurations_list_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:12
+msgid "stream_configuration_details_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:30
+msgid "application"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:33
+msgid "stream_configuration_do_not_share_warning"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:36
+msgid "how_to_configure_your_encoder_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:38
+msgid "set_this_stream_server_in_encoder"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:40
+msgid "set_this_stream_id_in_encoder"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_detail.html:48
+msgid "you_may_need_to_use_this_full_url_instead"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_form.html:5
+msgid "create_new_stream_configuration_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_form.html:21
+msgid "create_new_stream_configuration_text_html"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_list.html:8
+msgid "stream_configuration_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_list.html:19
+msgid "publishing"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_update_form.html:5
+msgid "update_stream_configuration_header"
+msgstr ""
+
+#: rtmp/templates/rtmp/stream_update_form.html:21
+msgid "update_stream_configuration_text_html"
+msgstr ""
+
+#: templates/base.html:36
+msgid "navbar_configuration"
+msgstr ""
+
+#: templates/base.html:39
+msgid "navbar_configuration_streaming_header"
+msgstr ""
+
+#: templates/base.html:40
+msgid "navbar_configuration_streams"
+msgstr ""
+
+#: templates/base.html:41
+msgid "navbar_configuration_restreams"
+msgstr ""
+
+#: templates/base.html:43
+msgid "navbar_configuration_account_header"
+msgstr ""
+
+#: templates/base.html:44
+msgid "navbar_configuration_password_change"
+msgstr ""
+
+#: templates/base.html:50
+msgid "navbar_logout"
+msgstr ""
+
+#: templates/base.html:52
+msgid "navbar_login"
+msgstr ""
+
+#: templates/registration/login.html:5 templates/registration/login.html:13
+msgid "login"
+msgstr ""
+
+#: templates/registration/login.html:18
+msgid "forgot_password_q"
+msgstr ""
+
+#: templates/registration/password_change_done.html:5
+msgid "password_change_successful"
+msgstr ""
+
+#: templates/registration/password_change_done.html:6
+msgid "password_change_successful_text"
+msgstr ""
+
+#: templates/registration/password_change_done.html:7
+msgid "take_me_to_safety"
+msgstr ""
+
+#: templates/registration/password_change_form.html:5
+msgid "change_password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:20
+msgid "change_password_text_html"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:20
+msgid "reset_password_text_html"
+msgstr ""
--- a/source/manage.py
+++ b/source/manage.py
--- a/source/config/migrations/init.py
+++ b/source/config/migrations/init.py
--- a/portal/admin.py
+++ b/portal/admin.py
@ -0,0 +1,3 @@
+from django.contrib import admin  # noqa
+
+# Register your models here.
--- a/portal/apps.py
+++ b/portal/apps.py
@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PortalConfig(AppConfig):
+    name = 'portal'
--- a/source/config/signals/init.py
+++ b/source/config/signals/init.py
--- a/portal/models.py
+++ b/portal/models.py
@ -0,0 +1,3 @@
+from django.db import models  # noqa
+
+# Create your models here.
--- a/portal/templates/portal/index.html
+++ b/portal/templates/portal/index.html
@ -0,0 +1,11 @@
+{% extends 'base.html' %}
+
+{% block 'content' %}
+  <div class="jumbotron">
+    <h1 class="display-4">Hello, world!</h1>
+    <p class="leader">Nothing to see here yet. We're working on it, though!</p>
+    <hr class="my-4">
+    <p>Portier will be a pretty cool streaming platform, built by and for nerds. You are welcome to contribute, be it code, ideas, documentation, design or something else entirely.</p>
+    <a class="btn btn-primary btn-lg" href="https://github.com/chaoswest-tv/portier" role="button">Code on GitHub</a>
+  </div>
+{% endblock %}
--- a/portal/tests.py
+++ b/portal/tests.py
@ -0,0 +1,3 @@
+from django.test import TestCase  # noqa
+
+# Create your tests here.
--- a/source/core/urls.py
+++ b/source/core/urls.py
--- a/portal/views.py
+++ b/portal/views.py
@ -0,0 +1,6 @@
+from django.shortcuts import render
+
+
+def index(request):
+    # do fancy stuff here maybe
+    return render(request, 'portal/index.html')
--- a/source/portier/init.py
+++ b/source/portier/init.py
--- a/source/portier/asgi.py
+++ b/source/portier/asgi.py
--- a/source/portier/celery.py
+++ b/source/portier/celery.py
--- a/source/portier/common/handlers.py
+++ b/source/portier/common/handlers.py
@ -2,7 +2,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 from guardian.models import UserObjectPermission
 from guardian.models import GroupObjectPermission
-from django.contrib.auth.models import Group
+from django.contrib.auth.models import User, Group
 from django.conf import settings


--- a/source/portier/settings.py
+++ b/source/portier/settings.py
@ -11,7 +11,6 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
 """

 import os
-from django.utils.translation import gettext_lazy as _

 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@ -26,12 +25,10 @@ SECRET_KEY = os.environ.get("SECRET_KEY", default="CHANGE_ME!")
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = int(os.environ.get("DEBUG", default=0))
 ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", default="*").split(" ")
-CSRF_TRUSTED_ORIGINS = os.environ.get("DJANGO_CSRF_TRUSTED_ORIGINS", default="http://localhost").split(" ")
-CORS_ALLOW_ALL_ORIGINS = bool(os.environ.get("DEBUG", default=False))
-SESSION_COOKIE_SAMESITE = 'None'
+

 DEFAULT_GROUP = 'default'
-GLOBAL_STREAM_NAMESPACE = 'live'
+DEFAULT_RTMP_APPPLICATION = 'live'

 # Application definition

@ -42,22 +39,20 @@ INSTALLED_APPS = [
    'django.contrib.sessions',
    'django.contrib.messages',
    'django.contrib.staticfiles',
-    'ninja',
-    #'rest_framework',
    'guardian',
    'django_registration',
    'bootstrap4',
-    'fontawesome_5',
-    'django_celery_beat',
+    'fa',
    'core.apps.CoreConfig',
-    'config.apps.ConfigConfig',
+    'portal.apps.PortalConfig',
+    'rtmp.apps.RtmpConfig',
    'concierge.apps.ConciergeConfig',
+    'restream.apps.RestreamConfig',
 ]

 MIDDLEWARE = [
    'django.middleware.security.SecurityMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
@ -70,8 +65,6 @@ AUTHENTICATION_BACKENDS = (
    'guardian.backends.ObjectPermissionBackend',
 )

-ANONYMOUS_USER_NAME = None
-
 ROOT_URLCONF = 'portier.urls'

 TEMPLATES = [
@ -107,6 +100,7 @@ DATABASES = {
    }
 }

+
 # Password validation
 # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators

@ -136,18 +130,9 @@ ACCOUNT_ACTIVATION_DAYS = 7
 LANGUAGE_CODE = 'en-us'
 TIME_ZONE = 'UTC'
 USE_I18N = True
+USE_L10N = True
 USE_TZ = True

-LANGUAGES = [
-  ('de', _('German')),
-  ('en', _('English')),
-]
-
-LOCALE_PATHS = (
-    os.path.join(BASE_DIR, 'locale'),
-)
-
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/

@ -158,15 +143,6 @@ STATICFILES_DIRS = [
 ]


-# DRF
-
-REST_FRAMEWORK = {
-    'DEFAULT_PERMISSION_CLASSES': [
-        'rest_framework.permissions.DjangoObjectPermissions'
-    ]
-}
-
-
 # E-mail
 DEFAULT_FROM_EMAIL = os.environ.get('EMAIL_FROM')
 EMAIL_HOST = os.environ.get('EMAIL_HOST')
@ -184,41 +160,3 @@ CELERY_RESULT_BACKEND = "redis://{}:{}".format(os.environ.get('REDIS_HOST', defa
 CELERY_ACCEPT_CONTENT = ['application/json']
 CELERY_RESULT_SERIALIZER = 'json'
 CELERY_TASK_SERIALIZER = 'json'
-CELERY_BEAT_SCHEDULE = {
-    'config:scrape_srs_servers': {
-        'task': 'config.tasks.async_scrape_srs_servers',
-        'schedule': 5.0
-    },
-}
-# Fixes incompatibility with tzlocal and pytz
-DJANGO_CELERY_BEAT_TZ_AWARE = False 
-
-
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-
-if DEBUG == "LOLOLOL":
-    LOGGING = {
-        'version': 1,
-        'disable_existing_loggers': False,
-        'formatters': {
-            'console': {
-                'format': '%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
-            },
-        },
-        'handlers': {
-            'console': {
-                'class': 'logging.StreamHandler',
-                'formatter': 'console',
-            },
-        },
-        'loggers': {
-            'django': {
-                'level': 'DEBUG',
-                'handlers': ['console'],
-            },
-            '': {
-                'level': 'DEBUG',
-                'handlers': ['console'],
-            },
-        },
-    }
--- a/portier/urls.py
+++ b/portier/urls.py
@ -0,0 +1,27 @@
+"""portier URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/3.0/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import include, path
+
+urlpatterns = [
+    path('accounts/', include('django_registration.backends.activation.urls')),
+    path('accounts/', include('django.contrib.auth.urls')),
+    path('admin/', admin.site.urls),
+    path('rtmp/', include('rtmp.urls')),
+    path('restream/', include('restream.urls')),
+    path('concierge/', include('concierge.urls')),
+    path('', include('portal.urls')),
+]
--- a/source/portier/wsgi.py
+++ b/source/portier/wsgi.py
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@ -1,4 +0,0 @@
-{
-  "venvPath": "source",
-  "venv": ".venv"
-}
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,8 @@
+django>=3.0
+django-registration>=3.1
+django-bootstrap4
+django-guardian
+django-fa
+celery>=4.4
+gunicorn>=20
+psycopg2-binary
--- a/source/config/views/init.py
+++ b/source/config/views/init.py
--- a/restream/admin.py
+++ b/restream/admin.py
@ -0,0 +1,10 @@
+from django.contrib import admin
+from guardian.admin import GuardedModelAdmin
+from .models import RestreamConfig
+
+
+class RestreamConfigAdmin(GuardedModelAdmin):
+    fields = ['name', 'active', 'stream', 'target']
+
+
+admin.site.register(RestreamConfig, RestreamConfigAdmin)
--- a/restream/apps.py
+++ b/restream/apps.py
@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class RestreamConfig(AppConfig):
+    name = 'restream'
+
+    def ready(self):
+        import restream.signals  # noqa
--- a/restream/forms.py
+++ b/restream/forms.py
@ -0,0 +1,16 @@
+from django.forms import ModelForm
+from guardian.shortcuts import get_objects_for_user
+from . import models
+
+
+class RestreamConfigFilteredStreamForm(ModelForm):
+    class Meta:
+        model = models.RestreamConfig
+        fields = ['name', 'stream', 'target', 'active']
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop('user', None)
+        super().__init__(*args, **kwargs)
+
+        # limit the stream selection to user-accessible streams
+        self.fields['stream'].queryset = get_objects_for_user(user, 'rtmp.view_stream')
--- a/restream/migrations/0001_initial.py
+++ b/restream/migrations/0001_initial.py
@ -0,0 +1,26 @@
+# Generated by Django 3.0.5 on 2020-04-23 19:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('rtmp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RestreamConfig',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('target', models.CharField(max_length=500)),
+                ('name', models.CharField(max_length=100)),
+                ('active', models.BooleanField()),
+                ('stream', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rtmp.Stream')),
+            ],
+        ),
+    ]
--- a/restream/migrations/0002_auto_20200501_1302.py
+++ b/restream/migrations/0002_auto_20200501_1302.py
@ -0,0 +1,39 @@
+# Generated by Django 3.0.5 on 2020-05-01 13:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rtmp', '0004_auto_20200501_1302'),
+        ('restream', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='restreamconfig',
+            options={'verbose_name': 'restreamconfig_verbose_name', 'verbose_name_plural': 'restreamconfig_verbose_name_plural'},
+        ),
+        migrations.AlterField(
+            model_name='restreamconfig',
+            name='active',
+            field=models.BooleanField(help_text='restreamconfig_activate_help'),
+        ),
+        migrations.AlterField(
+            model_name='restreamconfig',
+            name='name',
+            field=models.CharField(help_text='restreamconfig_name_help', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='restreamconfig',
+            name='stream',
+            field=models.ForeignKey(help_text='restreamconfig_stream_help', on_delete=django.db.models.deletion.CASCADE, to='rtmp.Stream'),
+        ),
+        migrations.AlterField(
+            model_name='restreamconfig',
+            name='target',
+            field=models.CharField(help_text='restreamconfig_target_help', max_length=500),
+        ),
+    ]
--- a/restream/migrations/init.py
+++ b/restream/migrations/init.py
--- a/restream/models.py
+++ b/restream/models.py
@ -0,0 +1,30 @@
+from django.db import models
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+from django.db.models.signals import pre_delete
+from portier.common import handlers
+
+from rtmp.models import Stream
+
+
+class RestreamConfig(models.Model):
+    stream = models.ForeignKey(Stream, on_delete=models.CASCADE, help_text=_('restreamconfig_stream_help'))
+    target = models.CharField(max_length=500, help_text=_('restreamconfig_target_help'))
+    name = models.CharField(max_length=100, help_text=_('restreamconfig_name_help'))
+    active = models.BooleanField(help_text=_('restreamconfig_activate_help'))
+
+    class Meta:
+        verbose_name = _('restreamconfig_verbose_name')
+        verbose_name_plural = _('restreamconfig_verbose_name_plural')
+
+    def class_name(self):
+        return _('restreamconfig_class_name')
+
+    def get_absolute_url(self):
+        return reverse('restream:restreamconfig_detail', kwargs={'pk': self.pk})
+
+    def __str__(self):
+        return '{} to {}'.format(self.stream, self.name)
+
+
+pre_delete.connect(handlers.remove_obj_perms_connected_with_user, sender=RestreamConfig)
--- a/restream/signals.py
+++ b/restream/signals.py
@ -0,0 +1,23 @@
+from django.dispatch import receiver
+from rtmp.signals import stream_active
+from .models import RestreamConfig
+from rtmp.models import Stream
+from concierge.models import Task
+import json
+
+
+@receiver(stream_active)
+def create_tasks(sender, **kwargs):
+    stream = Stream.objects.get(stream=kwargs['stream'])
+    instances = RestreamConfig.objects.filter(active=True, stream=stream)
+    for inst in instances:
+        config = {
+            'name': inst.name,
+            'app': inst.stream.application.name,
+            'stream': str(inst.stream.stream),
+            'target': inst.target
+        }
+
+        json_config = json.dumps(config)
+        task = Task(stream=stream, type='restream', configuration=json_config)
+        task.save()
--- a/restream/templates/restream/restreamconfig_confirm_delete.html
+++ b/restream/templates/restream/restreamconfig_confirm_delete.html
@ -1,14 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-{% load fontawesome_5 %}
-
-{% block 'sidenav' %}
-  {% with 'pull' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
+{% load font_awesome %}
 {% block 'content' %}
 <h6>{% trans "confirm_delete_header" %}</h6>
 <hr class="my-4">
@ -16,10 +9,10 @@
  <div class="col-sm border-right">
    <form method="post">
      {% csrf_token %}
-      <p>{% blocktrans with restream_config_name=object.name %}are_you_sure_you_want_to_delete_"{{ pull_config_name }}"?{% endblocktrans %}</p>
+      <p>{% blocktrans with restreamconfig_config_name=object.name %}are_you_sure_you_want_to_delete_"{{ restreamconfig_config_name }}"?{% endblocktrans %}</p>
      {% buttons %}
        <button type="submit" class="btn btn-danger" value="login">
-          {% fa5_icon 'trash' %} {% trans "delete" %}
+          {% fa 'trash' %} {% trans "delete" %}
        </button>
      {% endbuttons %}
      <input type="hidden" name="next" value="{{ next }}">
--- a/restream/templates/restream/restreamconfig_detail.html
+++ b/restream/templates/restream/restreamconfig_detail.html
@ -1,30 +1,23 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load font_awesome %}
 {% load guardian_tags %}

 {% get_obj_perms user for object as "obj_perms" %}

-
-{% block 'sidenav' %}
-  {% with 'restream' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
 {% block 'content' %}
 <div class="row  justify-content-between">
  <div class="col">
-    <h6>{% trans "restream_configuration_details_header" %}</h6>
+    <h6>{% trans "restreamconfig_configuration_details_header" %}</h6>
  </div>
  {% get_obj_perms user for object as "obj_perms" %}
  <div class="col-auto">
-  {% if "change_restream" in obj_perms %}
-  <a href="{% url 'config:restream_change' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary">{% fa5_icon 'edit' %} {% trans 'change' %}</a>
+  {% if "change_restreamconfig" in obj_perms %}
+  <a href="{% url 'restream:restreamconfig_change' pk=object.pk %}" type="button" class="btn btn-primary">{% fa 'pencil' %} {% trans 'change' %}</a>
  {% endif %}
-  {% if "delete_restream" in obj_perms %}
-  <a href="{% url 'config:restream_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %} {% trans 'delete' %}</a>
+  {% if "delete_restreamconfig" in obj_perms %}
+  <a href="{% url 'restream:restreamconfig_delete' pk=object.pk %}" type="button" class="btn btn-danger">{% fa 'trash' %} {% trans 'delete' %}</a>
  {% endif %}
  </div>
 </div>
@ -35,21 +28,13 @@
      <dt class="col-sm-3">{% trans "name" %}</dt>
      <dd class="col-sm-9">{{ object.name }}</dd>
      <dt class="col-sm-3">{% trans "stream" %}</dt>
-      <dd class="col-sm-9"><a href="{% url 'config:stream_detail' pk=object.stream.pk %}">{{ object.stream.name }}</a></dd>
-      <dt class="col-sm-3">{% trans "active" %}</dt>
-      <dd class="col-sm-9">
-        {% if object.active %}
-          <span class="text-success">{% fa5_icon 'check-circle' %}</span>
-        {% else %}
-          <span class="text-danger">{% fa5_icon 'times-circle' %}</span>
-        {% endif %}
-      </dd>
+      <dd class="col-sm-9"><a href="{% url 'rtmp:stream_detail' pk=object.stream.pk %}">{{ object.stream.name }}</a></dd>
    </dl>
  </div>
  <div class="col-sm">
    <p>{% trans "configured_target_url" %}</p>
    <div class="input-group mb-4" id="show_hide_target_url">
-      <input readonly class="form-control" type="password" value="{{ object.target }}">
+      <input class="form-control" type="password" value="{{ object.target }}">
      <div class="input-group-append">
        <a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
      </div>
--- a/restream/templates/restream/restreamconfig_form.html
+++ b/restream/templates/restream/restreamconfig_form.html
@ -1,15 +1,8 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-
-{% block 'sidenav' %}
-  {% with 'pull' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
 {% block 'content' %}
-<h6>{% trans "update_pull_configuration_header" %}</h6>
+<h6>{% trans "create_new_restreamconfig_configuration_header" %}</h6>
 <hr class="my-4">
 <div class="row">
  <div class="col-sm border-right">
@ -25,7 +18,7 @@
    </form>
  </div>
  <div class="col-sm">
-    {% trans "pull_configuration_text_html" %}
+    {% trans "create_new_restreamconfig_configuration_text_html" %}
  </div>
 </div>
 {% endblock %}
--- a/restream/templates/restream/restreamconfig_list.html
+++ b/restream/templates/restream/restreamconfig_list.html
@ -0,0 +1,49 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load bootstrap4 %}
+{% load font_awesome %}
+{% load guardian_tags %}
+
+{% block 'content' %}
+<h6>{% trans "restreamconfig_configuration_header" %}</h6>
+<hr class="my-4">
+<div class="btn-toolbar mb-4" role="toolbar">
+  <div class="btn-group" role="group">
+    <a href="{% url 'restream:restreamconfig_create' %}" type="button" class="btn btn-sm btn-outline-success">{% fa 'plus' %} {% trans "create" %}</a>
+  </div>
+</div>
+<table class="table">
+  <thead class="thead-dark">
+    <tr>
+      <th scope="col">{% trans "name" %}</th>
+      <th scope="col">{% trans "active" %}</th>
+      <th scope="col" class="text-right">{% trans "actions" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for object in object_list %}
+    {% get_obj_perms user for object as "obj_perms" %}
+    {% if "view_restreamconfig" in obj_perms %}
+    <tr>
+      <th scope="row">{{ object.name }}</th>
+      <td>
+        {% if object.active %}
+          <span class="text-success">{% fa 'check-circle' %}</span>
+        {% else %}
+          <span class="text-danger">{% fa 'times-circle' %}</span>
+        {% endif %}
+      </td>
+      <td align="right">
+        <div class="btn-group" role="group">
+        <a href="{% url 'restream:restreamconfig_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-primary">{% trans "details" %}</a>
+        {% if "delete_restreamconfig" in obj_perms %}
+        <a href="{% url 'restream:restreamconfig_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-danger">{% fa 'trash' %}</a>
+        {% endif %}
+        </div>
+      </td>
+    </tr>
+    {% endif %}
+    {% endfor %}
+  </tbody>
+</table>
+{% endblock %}
--- a/restream/templates/restream/restreamconfig_update_form.html
+++ b/restream/templates/restream/restreamconfig_update_form.html
@ -1,15 +1,8 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-
-{% block 'sidenav' %}
-  {% with 'pull' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
 {% block 'content' %}
-<h6>{% trans "create_new_pull_configuration_header" %}</h6>
+<h6>{% trans "update_restreamconfig_configuration_header" %}</h6>
 <hr class="my-4">
 <div class="row">
  <div class="col-sm border-right">
@ -25,7 +18,7 @@
    </form>
  </div>
  <div class="col-sm">
-    {% trans "pull_configuration_text_html" %}
+    {% trans "update_restreamconfig_configuration_text_html" %}
  </div>
 </div>
 {% endblock %}
--- a/restream/tests.py
+++ b/restream/tests.py
@ -0,0 +1,3 @@
+from django.test import TestCase  # noqa
+
+# Create your tests here.
--- a/restream/urls.py
+++ b/restream/urls.py
@ -0,0 +1,12 @@
+from django.urls import path
+from . import views
+
+app_name = 'restream'
+
+urlpatterns = [
+    path('restreamconfig/', views.RestreamConfigList.as_view(), name='restreamconfig_list'),
+    path('restreamconfig/<int:pk>/', views.RestreamConfigDetail.as_view(), name='restreamconfig_detail'),
+    path('restreamconfig/<int:pk>/change', views.RestreamConfigChange.as_view(), name='restreamconfig_change'),
+    path('restreamconfig/<int:pk>/delete', views.RestreamConfigDelete.as_view(), name='restreamconfig_delete'),
+    path('restreamconfig/create', views.RestreamConfigCreate.as_view(), name='restreamconfig_create'),
+]
--- a/restream/views.py
+++ b/restream/views.py
@ -0,0 +1,70 @@
+from django.urls import reverse_lazy
+from django.contrib.auth.decorators import login_required
+from django.utils.decorators import method_decorator
+from django.views.generic import ListView, DetailView, CreateView, DeleteView, UpdateView
+from guardian.decorators import permission_required_or_403
+from guardian.shortcuts import assign_perm
+
+from . import models
+from . import forms
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required_or_403('restream.add_restreamconfig'),
+                  name='dispatch')
+class RestreamConfigList(ListView):
+    model = models.RestreamConfig
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required_or_403('restream.view_restreamconfig',
+                  (models.RestreamConfig, 'pk', 'pk')),
+                  name='dispatch')
+class RestreamConfigDetail(DetailView):
+    model = models.RestreamConfig
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required_or_403('restream.change_restreamconfig',
+                  (models.RestreamConfig, 'pk', 'pk')),
+                  name='dispatch')
+class RestreamConfigChange(UpdateView):
+    model = models.RestreamConfig
+    form_class = forms.RestreamConfigFilteredStreamForm
+    template_name_suffix = '_update_form'
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['user'] = self.request.user
+        return kwargs
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required_or_403('restream.add_restreamconfig'),
+                  name='dispatch')
+class RestreamConfigCreate(CreateView):
+    model = models.RestreamConfig
+    form_class = forms.RestreamConfigFilteredStreamForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['user'] = self.request.user
+        return kwargs
+
+    def form_valid(self, form):
+        valid = super().form_valid(form)
+        if valid:
+            user = self.request.user
+            assign_perm('view_restreamconfig', user, self.object)
+            assign_perm('change_restreamconfig', user, self.object)
+            assign_perm('delete_restreamconfig', user, self.object)
+        return valid
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required_or_403('restream.delete_restreamconfig',
+                  (models.RestreamConfig, 'pk', 'pk')),
+                  name='dispatch')
+class RestreamConfigDelete(DeleteView):
+    model = models.RestreamConfig
+    success_url = reverse_lazy('restream:restreamconfig_list')
--- a/source/core/templatetags/init.py
+++ b/source/core/templatetags/init.py
--- a/rtmp/admin.py
+++ b/rtmp/admin.py
@ -0,0 +1,15 @@
+from django.contrib import admin
+from guardian.admin import GuardedModelAdmin
+from .models import Application, Stream
+
+
+class ApplicationAdmin(GuardedModelAdmin):
+    fields = ['name']
+
+
+class StreamAdmin(GuardedModelAdmin):
+    fields = ['application', 'stream', 'name', 'publish_counter']
+
+
+admin.site.register(Application, ApplicationAdmin)
+admin.site.register(Stream, StreamAdmin)
--- a/rtmp/apps.py
+++ b/rtmp/apps.py
@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class RtmpConfig(AppConfig):
+    name = 'rtmp'
+
+    def ready(self):
+        import rtmp.signals  # noqa
--- a/rtmp/forms.py
+++ b/rtmp/forms.py
@ -0,0 +1,16 @@
+from django.forms import ModelForm
+from guardian.shortcuts import get_objects_for_user
+from . import models
+
+
+class StreamFilteredApplicationForm(ModelForm):
+    class Meta:
+        model = models.Stream
+        fields = ['name', 'application']
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop('user', None)
+        super().__init__(*args, **kwargs)
+
+        # limit the stream selection to user-accessible streams
+        self.fields['application'].queryset = get_objects_for_user(user, 'rtmp.view_application')
--- a/rtmp/management/commands/createdefaultapplication.py
+++ b/rtmp/management/commands/createdefaultapplication.py
@ -0,0 +1,16 @@
+from django.core.management.base import BaseCommand
+from django.contrib.auth.models import Group
+from django.conf import settings
+from guardian.shortcuts import assign_perm
+
+from rtmp import models
+
+
+class Command(BaseCommand):
+    help = 'Creates a default RTMP application that is available to all users in the default group'
+
+    def handle(self, *args, **options):
+        default_group, _ = Group.objects.get_or_create(name=settings.DEFAULT_GROUP)
+        default_app, _ = models.Application.objects.get_or_create(name=settings.DEFAULT_RTMP_APPPLICATION)
+
+        assign_perm('view_application', default_group, default_app)
--- a/rtmp/migrations/0001_initial.py
+++ b/rtmp/migrations/0001_initial.py
@ -0,0 +1,32 @@
+# Generated by Django 3.0.5 on 2020-04-23 19:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Application',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='rtmp_application_name', max_length=100, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Stream',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('stream', models.CharField(default=uuid.uuid4, max_length=64, unique=True)),
+                ('name', models.CharField(max_length=100)),
+                ('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rtmp.Application')),
+            ],
+        ),
+    ]
--- a/rtmp/migrations/0002_stream_publish_counter.py
+++ b/rtmp/migrations/0002_stream_publish_counter.py
@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-04-26 17:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rtmp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stream',
+            name='publish_counter',
+            field=models.PositiveIntegerField(default=0),
+        ),
+    ]
--- a/rtmp/migrations/0003_auto_20200426_1834.py
+++ b/rtmp/migrations/0003_auto_20200426_1834.py
@ -0,0 +1,19 @@
+# Generated by Django 3.0.5 on 2020-04-26 18:34
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rtmp', '0002_stream_publish_counter'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stream',
+            name='stream',
+            field=models.UUIDField(default=uuid.uuid4, unique=True),
+        ),
+    ]
--- a/rtmp/migrations/0004_auto_20200501_1302.py
+++ b/rtmp/migrations/0004_auto_20200501_1302.py
@ -0,0 +1,34 @@
+# Generated by Django 3.0.5 on 2020-05-01 13:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rtmp', '0003_auto_20200426_1834'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='application',
+            options={'verbose_name': 'application_verbose_name', 'verbose_name_plural': 'application_verbose_name_plural'},
+        ),
+        migrations.AlterField(
+            model_name='stream',
+            name='application',
+            field=models.ForeignKey(help_text='stream_application_help', on_delete=django.db.models.deletion.CASCADE, to='rtmp.Application'),
+        ),
+        migrations.AlterField(
+            model_name='stream',
+            name='name',
+            field=models.CharField(help_text='stream_name_help', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='stream',
+            name='stream',
+            field=models.UUIDField(default=uuid.uuid4, help_text='stream_stream_help', unique=True),
+        ),
+    ]
--- a/rtmp/migrations/init.py
+++ b/rtmp/migrations/init.py
--- a/rtmp/models.py
+++ b/rtmp/models.py
@ -0,0 +1,75 @@
+import uuid
+
+from django.db import models
+from django.urls import reverse
+from django.utils.translation import gettext as _
+from django.db.models.signals import pre_delete
+from portier.common import handlers
+
+from . import signals
+
+
+class Application(models.Model):
+    name = models.CharField(max_length=100, unique=True, help_text=_("rtmp_application_name"))
+
+    class Meta:
+        verbose_name = _('application_verbose_name')
+        verbose_name_plural = _('application_verbose_name_plural')
+
+    def class_name(self):
+        return _('aplication_class_name')
+
+    def __str__(self):
+        return self.name
+
+
+class Stream(models.Model):
+    application = models.ForeignKey(Application, on_delete=models.CASCADE, help_text=_('stream_application_help'))
+    stream = models.UUIDField(unique=True, default=uuid.uuid4, help_text=_('stream_stream_help'))
+    name = models.CharField(max_length=100, help_text=_('stream_name_help'))
+
+    # the same stream uuid can be published multiple times to different origin
+    # servers. this is a valid scheme to achieve a failover on the origin layer.
+    # thus we need to keep track if a stream is published at least once,
+    # and only send signals when we are going to / coming from 0 published streams.
+    publish_counter = models.PositiveIntegerField(default=0)
+
+    def on_publish(self, param):
+        # if so far there were less than one incoming streams, this stream
+        # is now being considered active
+        if self.publish_counter < 1:
+            signals.stream_active.send(sender=self.__class__,
+                                       stream=str(self.stream),
+                                       param=param
+                                       )
+
+        # keep track of this incoming stream
+        self.publish_counter += 1
+        self.save()
+
+    def on_unpublish(self, param):
+        # note that we now have on less incoming stream
+        if self.publish_counter > 0:
+            self.publish_counter -= 1
+
+        # if we now have less than one incoming stream, this stream is being
+        # considered inactive
+        if self.publish_counter < 1:
+            signals.stream_inactive.send(sender=self.__class__,
+                                         stream=str(self.stream),
+                                         param=param
+                                         )
+        self.save()
+
+    def get_absolute_url(self):
+        return reverse('rtmp:stream_detail', kwargs={'pk': self.pk})
+
+    def class_name(self):
+        return _('stream_class_name')
+
+    def __str__(self):
+        return self.name
+
+
+pre_delete.connect(handlers.remove_obj_perms_connected_with_user, sender=Application)
+pre_delete.connect(handlers.remove_obj_perms_connected_with_user, sender=Stream)
--- a/rtmp/signals.py
+++ b/rtmp/signals.py
@ -0,0 +1,4 @@
+from django.dispatch import Signal
+
+stream_active = Signal(providing_args=['stream', 'params'])
+stream_inactive = Signal(providing_args=['stream', 'params'])
--- a/source/config/templates/config/stream_confirm_delete.html
+++ b/source/config/templates/config/stream_confirm_delete.html
@ -1,14 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-{% load fontawesome_5 %}
-
-{% block 'sidenav' %}
-  {% with 'stream' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
+{% load font_awesome %}
 {% block 'content' %}
 <h6>{% trans "confirm_delete_header" %}</h6>
 <hr class="my-4">
@ -22,7 +15,7 @@
      <p>{% blocktrans with stream_config_name=object.name %}are_you_sure_you_want_to_delete_"{{ stream_config_name }}"?{% endblocktrans %}</p>
      {% buttons %}
        <button type="submit" class="btn btn-danger" value="login">
-          {% fa5_icon 'trash' %} {% trans "delete" %}
+          {% fa 'trash' %} {% trans "delete" %}
        </button>
      {% endbuttons %}
      <input type="hidden" name="next" value="{{ next }}">
--- a/source/config/templates/config/stream_detail.html
+++ b/source/config/templates/config/stream_detail.html
@ -1,18 +1,11 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load font_awesome %}
 {% load guardian_tags %}
-{% load core_templatetag %}

 {% get_obj_perms user for object as "obj_perms" %}

-{% block 'sidenav' %}
-  {% with 'stream' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
 {% block 'content' %}
 <div class="row  justify-content-between">
  <div class="col">
@ -20,12 +13,12 @@
  </div>
  {% get_obj_perms user for object as "obj_perms" %}
  <div class="col-auto">
-    {% if "change_stream" in obj_perms %}
-    <a href="{% url 'config:stream_change' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary">{% fa5_icon 'edit' %} {% trans 'change' %}</a>
-    {% endif %}
-    {% if "delete_stream" in obj_perms %}
-    <a href="{% url 'config:stream_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %} {% trans 'delete' %}</a>
-    {% endif %}
+  {% if "change_stream" in obj_perms %}
+  <a href="{% url 'rtmp:stream_change' pk=object.pk %}" type="button" class="btn btn-primary">{% fa 'pencil' %} {% trans 'change' %}</a>
+  {% endif %}
+  {% if "delete_stream" in obj_perms %}
+  <a href="{% url 'rtmp:stream_delete' pk=object.pk %}" type="button" class="btn btn-danger">{% fa 'trash' %} {% trans 'delete' %}</a>
+  {% endif %}
  </div>
 </div>
 <hr class="my-4">
@ -34,28 +27,31 @@
    <dl class="row">
      <dt class="col-sm-3">{% trans "name" %}</dt>
      <dd class="col-sm-9">{{ object.name }}</dd>
+      <dt class="col-sm-3">{% trans "application" %}</dt>
+      <dd class="col-sm-9">{{ object.application }}</dd>
    </dl>
+    <p>{% trans "stream_configuration_do_not_share_warning" %}</p>
+  </div>
+  <div class="col-sm">
    <h6>{% trans "how_to_configure_your_encoder_header" %}</h6>
    <hr class="my-4">
    <p>{% trans "set_this_stream_server_in_encoder" %}</p>
-    <p class="mb-4">
-      <ul>
-        {% for node in srs_nodes %}
-        {% if node.active %}
-        <li><code>{{ node.rtmp_base }}/{% settings_value "GLOBAL_STREAM_NAMESPACE" %}/</code></p>
-        {% endif %}
-        {% endfor %}
-      </ul>
+    <code>rtmp://TODO TODO SERVER BASE URL/{{ object.application }}/</code>
    <p>{% trans "set_this_stream_id_in_encoder" %}</p>
    <div class="input-group mb-4" id="show_hide_stream_key">
-      <input readonly class="form-control" type="password" value="{{ object.stream }}">
+      <input class="form-control" type="password" value="{{ object.stream }}">
+      <div class="input-group-append">
+        <a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
+      </div>
+    </div>
+    <hr class="my-4">
+    <p>{% trans "you_may_need_to_use_this_full_url_instead" %}</p>
+    <div class="input-group mb-4" id="show_hide_stream_url">
+      <input class="form-control" type="password" value="rtmp://TODO TODO TODO SERVER BASE URL/{{ object.stream }}">
      <div class="input-group-append">
        <a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
      </div>
    </div>
-  </div>
-  <div class="col-sm">
-    {% trans "stream_configuration_text_html" %}
  </div>
 </div>
 <script>
@ -76,5 +72,19 @@
        }
    });
  });
+  $(function() {
+    $("#show_hide_stream_url a").on('click', function(event) {
+        event.preventDefault();
+        if ($('#show_hide_stream_url input').attr('type') == 'text') {
+            $('#show_hide_stream_url input').attr('type', 'password');
+            $('#show_hide_stream_url i').addClass('fa-eye-slash');
+            $('#show_hide_stream_url i').removeClass('fa-eye');
+        } else if ($('#show_hide_stream_url input').attr('type') == 'password') {
+            $('#show_hide_stream_url input').attr('type', 'text');
+            $('#show_hide_stream_url i').removeClass('fa-eye-slash');
+            $('#show_hide_stream_url i').addClass('fa-eye');
+        }
+    });
+  });
 </script>
 {% endblock %}
--- a/source/config/templates/config/stream_form.html
+++ b/source/config/templates/config/stream_form.html
@ -1,13 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-
-{% block 'sidenav' %}
-  {% with 'stream' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
 {% block 'content' %}
 <h6>{% trans "create_new_stream_configuration_header" %}</h6>
 <hr class="my-4">
@ -25,7 +18,7 @@
    </form>
  </div>
  <div class="col-sm">
-    {% trans "stream_configuration_text_html" %}
+    {% trans "create_new_stream_configuration_text_html" %}
  </div>
 </div>
 {% endblock %}
--- a/rtmp/templates/rtmp/stream_list.html
+++ b/rtmp/templates/rtmp/stream_list.html
@ -0,0 +1,49 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load bootstrap4 %}
+{% load font_awesome %}
+{% load guardian_tags %}
+
+{% block 'content' %}
+<h6>{% trans "stream_configuration_header" %}</h6>
+<hr class="my-4">
+<div class="btn-toolbar mb-4" role="toolbar">
+  <div class="btn-group" role="group">
+    <a href="{% url 'rtmp:stream_create' %}" type="button" class="btn btn-sm btn-outline-success">{% fa 'plus' %} {% trans "create" %}</a>
+  </div>
+</div>
+<table class="table">
+  <thead class="thead-dark">
+    <tr>
+      <th scope="col">{% trans "name" %}</th>
+      <th scope="col">{% trans "publishing" %}</th>
+      <th scope="col" class="text-right">{% trans "actions" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for object in object_list %}
+    {% get_obj_perms user for object as "obj_perms" %}
+    {% if "view_stream" in obj_perms %}
+    <tr>
+      <th scope="ro">{{ object.name }}</th>
+      <td>
+        {% if object.publish_counter > 0 %}
+          <span class="text-success">{% fa 'check-circle' %}</span>
+        {% else %}
+          <span class="text-danger">{% fa 'times-circle' %}</span>
+        {% endif %}
+      </td>
+      <td align="right">
+        <div class="btn-group" role="group">
+        <a href="{% url 'rtmp:stream_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-primary">{% trans "details" %}</a>
+        {% if "delete_stream" in obj_perms %}
+        <a href="{% url 'rtmp:stream_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-danger">{% fa 'trash' %}</a>
+        {% endif %}
+        </div>
+      </td>
+    </tr>
+    {% endif %}
+    {% endfor %}
+  </tbody>
+</table>
+{% endblock %}
--- a/source/config/templates/config/stream_update_form.html
+++ b/source/config/templates/config/stream_update_form.html
@ -1,13 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap4 %}
-
-{% block 'sidenav' %}
-  {% with 'stream' as section %}
-    {{ block.super }}
-  {% endwith %}
-{% endblock %}
-
 {% block 'content' %}
 <h6>{% trans "update_stream_configuration_header" %}</h6>
 <hr class="my-4">
@ -25,7 +18,7 @@
    </form>
  </div>
  <div class="col-sm">
-    {% trans "stream_configuration_text_html" %}
+    {% trans "update_stream_configuration_text_html" %}
  </div>
 </div>
 {% endblock %}
--- a/rtmp/tests.py
+++ b/rtmp/tests.py
@ -0,0 +1,3 @@
+from django.test import TestCase  # noqa
+
+# Create your tests here.
--- a/rtmp/urls.py
+++ b/rtmp/urls.py
@ -0,0 +1,13 @@
+from django.urls import path
+from . import views
+
+app_name = 'rtmp'
+
+urlpatterns = [
+    path('callback/srs', views.callback_srs, name='callback_srs'),
+    path('streams/', views.StreamList.as_view(), name='stream_list'),
+    path('streams/<int:pk>/', views.StreamDetail.as_view(), name='stream_detail'),
+    path('streams/<int:pk>/change', views.StreamChange.as_view(), name='stream_change'),
+    path('streams/<int:pk>/delete', views.StreamDelete.as_view(), name='stream_delete'),
+    path('streams/create', views.StreamCreate.as_view(), name='stream_create'),
+]
--- a/source/config/views/stream.py
+++ b/source/config/views/stream.py
@ -1,54 +1,96 @@
+import json
 import logging

+from django.core.exceptions import ObjectDoesNotExist
+from django.http import HttpResponse
 from django.urls import reverse_lazy
 from django.contrib.auth.decorators import login_required
 from django.contrib.admin.utils import NestedObjects
 from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import ListView, DetailView, CreateView, DeleteView, UpdateView
 from guardian.decorators import permission_required_or_403
 from guardian.shortcuts import assign_perm

-from config import models, forms
+from . import models
+from . import forms

 logger = logging.getLogger(__name__)


+@csrf_exempt
+def callback_srs(request):
+    if request.method != 'POST':
+        return HttpResponse('1', status=405)
+
+    try:
+        json_data = json.loads(request.body)
+    except json.decoder.JSONDecodeError:
+        return HttpResponse('1', status=400)
+
+    try:
+        app_name = json_data['app']
+        stream_name = json_data['stream']
+        param = json_data['param']
+    except KeyError:
+        return HttpResponse('1', status=401)
+    try:
+        application = models.Application.objects.get(name=app_name)
+        stream = models.Stream.objects.get(stream=stream_name, application=application)
+
+    except ObjectDoesNotExist:
+        return HttpResponse('1', status=401)
+
+    if json_data.get('action') == 'on_publish':
+        stream.on_publish(param=param)
+
+    if json_data.get('action') == 'on_unpublish':
+        stream.on_unpublish(param=param)
+
+    return HttpResponse('0')
+
+
@method_decorator(login_required, name='dispatch')
-@method_decorator(permission_required_or_403('config.add_stream'),
+@method_decorator(permission_required_or_403('rtmp.add_stream'),
                  name='dispatch')
 class StreamList(ListView):
    model = models.Stream


@method_decorator(login_required, name='dispatch')
-@method_decorator(permission_required_or_403('config.view_stream',
+@method_decorator(permission_required_or_403('rtmp.view_stream',
                  (models.Stream, 'pk', 'pk')),
                  name='dispatch')
 class StreamDetail(DetailView):
    model = models.Stream

-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["srs_nodes"] = models.SRSNode.objects.all()
-        return context
-

@method_decorator(login_required, name='dispatch')
-@method_decorator(permission_required_or_403('config.change_stream',
+@method_decorator(permission_required_or_403('rtmp.change_stream',
                  (models.Stream, 'pk', 'pk')),
                  name='dispatch')
 class StreamChange(UpdateView):
    model = models.Stream
+    form_class = forms.StreamFilteredApplicationForm
    template_name_suffix = '_update_form'
-    fields = ['name']
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['user'] = self.request.user
+        return kwargs


@method_decorator(login_required, name='dispatch')
-@method_decorator(permission_required_or_403('config.add_stream'),
+@method_decorator(permission_required_or_403('rtmp.add_stream'),
                  name='dispatch')
 class StreamCreate(CreateView):
    model = models.Stream
-    fields = ['name']
+    form_class = forms.StreamFilteredApplicationForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['user'] = self.request.user
+        return kwargs

    def form_valid(self, form):
        valid = super().form_valid(form)
@ -61,12 +103,12 @@ class StreamCreate(CreateView):


@method_decorator(login_required, name='dispatch')
-@method_decorator(permission_required_or_403('config.delete_stream',
+@method_decorator(permission_required_or_403('rtmp.delete_stream',
                  (models.Stream, 'pk', 'pk')),
                  name='dispatch')
 class StreamDelete(DeleteView):
    model = models.Stream
-    success_url = reverse_lazy('config:stream_list')
+    success_url = reverse_lazy('rtmp:stream_list')

    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
@ -78,4 +120,3 @@ class StreamDelete(DeleteView):

        print(context['to_delete'])
        return context
-
--- a/source/setup.cfg
+++ b/source/setup.cfg
--- a/source/bootstrap_variables.scss
+++ b/source/bootstrap_variables.scss
@ -1,6 +0,0 @@
-
-$primary: rgb(17, 114, 26);
-$font-family-sans-serif: Inter,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-$enable-shadows: true;
-$enable-responsive-font-sizes: true;
-$enable-rounded: false;
--- a/source/concierge/api.py
+++ b/source/concierge/api.py
@ -1,112 +0,0 @@
-from ninja import Router, Schema
-from ninja.errors import HttpError
-from concierge import models
-from typing import List
-from django.db import transaction
-from django.shortcuts import get_object_or_404
-from django.utils.timezone import now
-from django.views.decorators.csrf import csrf_exempt
-
-import json
-
-
-router = Router()
-
-
-class ClaimReference(Schema):
-  uuid: str
-
-
-class AvailableTask(Schema):
-  uuid: str
-  type: str
-
-
-class HeartbeatResponse(Schema):
-  success: bool = True
-  claims: List[ClaimReference]
-  available: List[AvailableTask]
-
-
-class ClaimResponse(Schema):
-  uuid: str
-  type: str
-  configuration: dict
-
-
-class ReleaseResponse(Schema):
-  success: bool = True
-  uuid: str
-  type: str
-
-
-@router.post('/heartbeat/{identity}', response=HeartbeatResponse)
-@csrf_exempt
-def receive_heartbeat(request, identity: str):
-  try:
-    id = models.Identity.objects.get(identity=identity)
-  except models.Identity.DoesNotExist:
-    raise HttpError(403, "identity unknown")
-
-  # update heartbeat
-  id.heartbeat = now()
-  id.save()
-
-  # get current claims and available tasks
-  claims = models.Task.objects.filter(claimed_by=id).all()
-  available = models.Task.objects.filter(claimed_by=None).all()
-
-  return {
-      'success': True,
-      'claims': [{'uuid': str(o.uuid)} for o in list(claims)],
-      'available': [{'uuid': str(o.uuid), 'type': o.type} for o in list(available)],
-  }
-
-
-@router.post('/claim/{identity}/{task_uuid}', response=ClaimResponse)
-@csrf_exempt
-def claim_task(request, identity: str, task_uuid: str):
-  try:
-    id = models.Identity.objects.get(identity=identity)
-  except models.Identity.DoesNotExist:
-    raise HttpError(403, "identity unknown")
-
-  with transaction.atomic():
-    task = get_object_or_404(models.Task, uuid=task_uuid)
-
-    if task.claimed_by:
-      raise HttpError(423, "task already claimed")
-
-    task.claimed_by = id
-    task.save()
-
-    return {
-        'success': True,
-        'uuid': task.uuid,
-        'type': task.type,
-        'configuration': json.loads(task.configuration)
-    }
-
-
-@router.post('/release/{identity}/{task_uuid}')
-@csrf_exempt
-def release_task(request, identity: str, task_uuid: str):
-  try:
-    id = models.Identity.objects.get(identity=identity)
-  except models.Identity.DoesNotExist:
-    raise HttpError(403, "identity unknown")
-
-  with transaction.atomic():
-    task = get_object_or_404(models.Task, uuid=task_uuid)
-
-    if task.claimed_by != id:
-      raise HttpError(403, "task not claimed by this identity")
-
-    task.claimed_by = None
-    task.save()
-
-    return {
-      'success': True,
-      'uuid': task.uuid,
-      'type': task.type,
-    }
--- a/source/concierge/signals.py
+++ b/source/concierge/signals.py
@ -1,12 +0,0 @@
-from django.dispatch import receiver
-from .models import Task
-from config.signals_shared import stream_inactive
-from config.models import Stream
-
-
-@receiver(stream_inactive)
-def delete_tasks_when_stream_inactive(sender, **kwargs):
-    # when a stream has become inactive, all related tasks which are created for the stream need to be deleted.
-    # we need to exclude the pull tasks, as they are not created for the stream.
-    stream = Stream.objects.get(stream=kwargs['stream'])
-    Task.objects.filter(stream=stream).exclude(type="pull").delete()
--- a/source/config/admin.py
+++ b/source/config/admin.py
@ -1,31 +0,0 @@
-from django.contrib import admin
-from guardian.admin import GuardedModelAdmin
-from config.models import Stream, Restream, Pull, SRSNode, SRSStreamInstance
-
-
-@admin.register(Stream)
-class StreamAdmin(GuardedModelAdmin):
-    fields = ['stream', 'name', 'publish_counter']
-
-@admin.register(Restream)
-class RestreamAdmin(GuardedModelAdmin):
-    fields = ['name', 'active', 'stream', 'format', 'target']
-
-@admin.register(Pull)
-class PullAdmin(GuardedModelAdmin):
-    fields = ['name', 'active', 'stream', 'source']
-
-@admin.register(SRSNode)
-class SRSNodeAdmin(GuardedModelAdmin):
-    fields = ['name', 'api_base', 'rtmp_base', 'active']
-
-@admin.register(SRSStreamInstance)
-class SRSStreamInstanceAdmin(GuardedModelAdmin):
-    fields = ['stream', 'node']
-
-    # Stream Instances are just representations of the streams on the SRS server,
-    # and should not be addable/editable. Deleting them can be useful though.
-    def has_change_permission(self, request, obj=None):
-        return False
-    def has_add_permission(self, request):
-        return False
--- a/source/config/api.py
+++ b/source/config/api.py
@ -1,216 +0,0 @@
-from ninja import Router, ModelSchema, Schema
-from ninja.errors import HttpError
-from config import models
-from typing import List
-from guardian.shortcuts import get_objects_for_user, assign_perm
-from django.shortcuts import get_object_or_404
-
-router = Router()
-
-
-class Restream(ModelSchema):
-  class Meta:
-    model = models.Restream
-    fields = "__all__"
-
-
-class RestreamPatch(ModelSchema):
-  class Meta:
-    model = models.Restream
-    exclude = ["id"]
-    fields_optional = "__all__"
-    extra = "forbid"
-
-
-class Pull(ModelSchema):
-  class Meta:
-    model = models.Pull
-    fields = "__all__"
-
-
-class PullPatch(ModelSchema):
-  class Meta:
-    model = models.Pull
-    exclude = ["id"]
-    fields_optional = "__all__"
-    extra = "forbid"
-
-
-class Stream(ModelSchema):
-  class Meta:
-    model = models.Stream
-    fields = "__all__"
-
-
-class StreamPatch(ModelSchema):
-  class Meta:
-    model = models.Stream
-    fields = ["name"]
-    fields_optional = "__all__"
-    extra = "forbid"
-
-
-class StreamCreate(ModelSchema):
-  class Meta:
-    model = models.Stream
-    fields = ["name"]
-    extra = "forbid"
-
-
-@router.get('/streams', response=List[Stream])
-def list_streams(request):
-  return get_objects_for_user(request.user, 'view_stream', models.Stream.objects.all())
-
-
-@router.post('/streams', response=Stream)
-def create_stream(request, payload: StreamCreate):
-  stream = models.Stream.objects.create(**payload.dict())
-  assign_perm('view_stream', request.user, stream)
-  assign_perm('change_stream', request.user, stream)
-  assign_perm('delete_stream', request.user, stream)
-  return stream
-
-
-@router.get('/streams/{id}', response=Stream)
-def get_stream(request, id: int):
-  stream = get_object_or_404(models.Stream, id=id)
-
-  if not request.user.has_perm('view_stream', stream):
-    raise HttpError(401, "unauthorized")
-  return stream
-
-
-@router.patch('/streams/{id}', response=Stream)
-def update_stream(request, id: int, payload: StreamPatch):
-  stream = get_object_or_404(models.Stream, id=id)
-
-  if not request.user.has_perm('change_stream', stream):
-    raise HttpError(401, "unauthorized")
-
-  stream.name = payload.name
-  stream.save()
-  return stream
-
-
-@router.delete('/streams/{id}', response=None)
-def delete_stream(request, id: int):
-  stream = get_object_or_404(models.Stream, id=id)
-
-  if not request.user.has_perm('delete_stream', stream):
-    raise HttpError(401, "unauthorized")
-
-  stream.delete()
-
-####################################################################################################
-
-@router.get('/restreams', response=List[Restream])
-def list_restreams(request):
-  return get_objects_for_user(request.user, 'view_restream', models.Restream.objects.all())
-
-
-@router.post('/restreams', response=Restream)
-def create_restream(request, payload: Restream):
-  if not request.user.has_perm('view_stream', payload.stream):
-    raise HttpError(401, "unauthorized")
-
-  restream = models.Restream.objects.create(**payload.dict())
-  assign_perm('view_restream', request.user, restream)
-  assign_perm('change_restream', request.user, restream)
-  assign_perm('delete_restream', request.user, restream)
-  return restream
-
-
-@router.get('/restreams/{id}', response=Restream)
-def get_restream(request, id: int):
-  restream = get_object_or_404(models.Restream, id=id)
-  
-  if not request.user.has_perm('view_restream', restream):
-    raise HttpError(401, "unauthorized")
-
-  return restream
-
-
-@router.patch('/restreams/{id}', response=Restream)
-def update_restream(request, id: int, payload: RestreamPatch):
-  restream = get_object_or_404(models.Restream, id=id)
-
-  if not request.user.has_perm('change_restream', restream):
-    raise HttpError(401, "unauthorized")
-
-  if payload.stream:
-    payload.stream = get_object_or_404(models.Stream, id=payload.stream)
-    
-    if not request.user.has_perm('view_stream', payload.stream):
-      raise HttpError(401, "unauthorized")
-
-  for key, value in payload.dict(exclude_unset=True).items():
-    setattr(restream, key, value)
-  restream.save()
-  return restream
-
-
-@router.delete('/restreams/{id}', response=None)
-def delete_restream(request, id: int):
-  restream = get_object_or_404(models.Restream, id=id)
-
-  if not request.user.has_perm('delete_restream', restream):
-    raise HttpError(401, "unauthorized")
-
-  restream.delete()
-
-####################################################################################################
-
-@router.get('/pulls', response=List[Pull])
-def list_pulls(request):
-  return get_objects_for_user(request.user, 'view_pull', models.Pull.objects.all())
-
-
-@router.post('/pulls', response=Pull)
-def create_pull(request, payload: Pull):
-  if not request.user.has_perm('view_stream', payload.stream):
-    raise HttpError(401, "unauthorized")
-
-  pull = models.Pull.objects.create(**payload.dict())
-  assign_perm(  'view_pull', request.user, Pull)
-  assign_perm('change_pull', request.user, Pull)
-  assign_perm('delete_pull', request.user, Pull)
-  return pull 
-
-
-@router.get('/pulls/{id}', response=Pull)
-def get_pull(request, id: int):
-  pull = get_object_or_404(models.Pull, id=id)
-  
-  if not request.user.has_perm('view_pull', pull):
-    raise HttpError(401, "unauthorized")
-
-  return pull 
-
-
-@router.patch('/pulls/{id}', response=Pull)
-def patch_pull(request, id: int, payload: PullPatch):
-  pull = get_object_or_404(models.Pull, id=id)
-
-  if not request.user.has_perm('change_pull', pull):
-    raise HttpError(401, "unauthorized")
-
-  if payload.stream:
-    payload.stream = get_object_or_404(models.Stream, id=payload.stream)
-    
-    if not request.user.has_perm('view_stream', payload.stream):
-      raise HttpError(401, "unauthorized")
-
-  for key, value in payload.dict(exclude_unset=True).items():
-    setattr(pull, key, value)
-  pull.save()
-  return pull
-
-
-@router.delete('/pulls/{id}', response=None)
-def delete_pull(request, id: int):
-  pull = get_object_or_404(models.Pull, id=id)
-
-  if not request.user.has_perm('delete_pull', pull):
-    raise HttpError(401, "unauthorized")
-
-  pull.delete()
--- a/source/config/apps.py
+++ b/source/config/apps.py
@ -1,9 +0,0 @@
-from django.apps import AppConfig
-
-
-class ConfigConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'config'
-
-    def ready(self):
-        import config.signals.pull, config.signals.restream, config.signals_shared  # noqa
--- a/source/config/forms.py
+++ b/source/config/forms.py
@ -1,28 +0,0 @@
-from django.forms import ModelForm
-from guardian.shortcuts import get_objects_for_user
-from . import models
-
-
-class RestreamFilteredStreamForm(ModelForm):
-    class Meta:
-        model = models.Restream
-        fields = ['name', 'stream', 'target', 'format', 'active']
-
-    def __init__(self, *args, **kwargs):
-        user = kwargs.pop('user', None)
-        super().__init__(*args, **kwargs)
-
-        # limit the stream selection to user-accessible streams
-        self.fields['stream'].queryset = get_objects_for_user(user, 'config.view_stream')
-
-class PullFilteredStreamForm(ModelForm):
-    class Meta:
-        model = models.Pull
-        fields = ['name', 'stream', 'source', 'active']
-
-    def __init__(self, *args, **kwargs):
-        user = kwargs.pop('user', None)
-        super().__init__(*args, **kwargs)
-
-        # limit the stream selection to user-accessible streams
-        self.fields['stream'].queryset = get_objects_for_user(user, 'config.view_stream')
--- a/source/config/migrations/0001_initial.py
+++ b/source/config/migrations/0001_initial.py
@ -1,40 +0,0 @@
-# Generated by Django 5.0.2 on 2024-02-27 19:20
-
-import django.db.models.deletion
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Stream',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('stream', models.UUIDField(default=uuid.uuid4, help_text='Stream ID for this stream', unique=True)),
-                ('name', models.CharField(help_text='Name for this stream', max_length=100)),
-                ('publish_counter', models.PositiveIntegerField(default=0)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Restream',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('target', models.CharField(help_text='restream_target_help', max_length=500)),
-                ('name', models.CharField(help_text='restream_name_help', max_length=100)),
-                ('active', models.BooleanField(help_text='restream_activate_help')),
-                ('format', models.CharField(choices=[('flv', 'flv (RTMP)'), ('mpegts', 'mpegts (SRT)')], default='flv', help_text='restream_format_help', max_length=6)),
-                ('stream', models.ForeignKey(help_text='restream_stream_help', on_delete=django.db.models.deletion.CASCADE, to='config.stream')),
-            ],
-            options={
-                'verbose_name': 'restream_verbose_name',
-                'verbose_name_plural': 'restream_verbose_name_plural',
-            },
-        ),
-    ]
--- a/source/config/migrations/0002_srsnode_srsstreaminstance.py
+++ b/source/config/migrations/0002_srsnode_srsstreaminstance.py
@ -1,42 +0,0 @@
-# Generated by Django 5.0.2 on 2024-02-29 17:26
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('config', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SRSNode',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='srsnode_name_help', max_length=100)),
-                ('api_base', models.CharField(help_text='srsnode_api_base_help', max_length=256)),
-                ('rtmp_base', models.CharField(help_text='srsnode_rtmp_base_help', max_length=256)),
-                ('active', models.BooleanField(help_text='srsnode_active_help')),
-            ],
-            options={
-                'verbose_name': 'srsnode_verbose_name',
-                'verbose_name_plural': 'srsnode_verbose_name_plural',
-            },
-        ),
-        migrations.CreateModel(
-            name='SRSStreamInstance',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('last_update', models.DateTimeField(auto_now=True, help_text='srsstreaminstance_last_update_help')),
-                ('statusdata', models.TextField(default='{}', help_text='srsstreaminstance_statusdata_help')),
-                ('node', models.ForeignKey(help_text='srsstreaminstance_node_help', on_delete=django.db.models.deletion.CASCADE, to='config.srsnode')),
-                ('stream', models.ForeignKey(help_text='srsstreaminstance_stream_help', on_delete=django.db.models.deletion.CASCADE, to='config.stream')),
-            ],
-            options={
-                'verbose_name': 'srsstreaminstance_verbose_name',
-                'verbose_name_plural': 'srsstreaminstance_verbose_name_plural',
-            },
-        ),
-    ]
--- a/source/config/migrations/0003_pull.py
+++ b/source/config/migrations/0003_pull.py
@ -1,28 +0,0 @@
-# Generated by Django 5.0.2 on 2024-04-01 08:08
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('config', '0002_srsnode_srsstreaminstance'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Pull',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('source', models.CharField(help_text='pull_source_help', max_length=500)),
-                ('active', models.BooleanField(help_text='pull_activate_help')),
-                ('name', models.CharField(help_text='pull_name_help', max_length=100)),
-                ('stream', models.ForeignKey(help_text='pull_stream_help', on_delete=django.db.models.deletion.CASCADE, to='config.stream')),
-            ],
-            options={
-                'verbose_name': 'pull_verbose_name',
-                'verbose_name_plural': 'pull_verbose_name_plural',
-            },
-        ),
-    ]
--- a/source/config/migrations/0004_alter_pull_source_alter_restream_target.py
+++ b/source/config/migrations/0004_alter_pull_source_alter_restream_target.py
@ -1,24 +0,0 @@
-# Generated by Django 5.0.2 on 2024-04-01 10:42
-
-import config.util
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('config', '0003_pull'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='pull',
-            name='source',
-            field=models.CharField(help_text='pull_source_help', max_length=500, validators=[config.util.validate_stream_url]),
-        ),
-        migrations.AlterField(
-            model_name='restream',
-            name='target',
-            field=models.CharField(help_text='restream_target_help', max_length=500, validators=[config.util.validate_stream_url]),
-        ),
-    ]
--- a/source/config/models.py
+++ b/source/config/models.py
@ -1,182 +0,0 @@
-import json
-import uuid
-
-from django.conf import settings
-from django.db import models
-from django.urls import reverse
-from django.utils.translation import gettext as _
-from django.db.models.signals import pre_delete
-from portier.common import handlers
-from config import signals_shared
-from config.util import validate_stream_url
-
-
-class Stream(models.Model):
-    stream = models.UUIDField(unique=True, default=uuid.uuid4, help_text=_('stream_stream_help'))
-    name = models.CharField(max_length=100, help_text=_('stream_name_help'))
-
-    # the same stream uuid can be published multiple times to different origin
-    # servers. this is a valid scheme to achieve a failover on the origin layer.
-    # thus we need to keep track if a stream is published at least once,
-    # and only send signals when we are going to / coming from 0 published streams.
-    publish_counter = models.PositiveIntegerField(default=0)
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        if self.publish_counter > 0:
-            signals_shared.stream_active.send(sender=self.__class__,
-                                              stream=str(self.stream),
-                                              param=None
-                                              )
-        else:
-            signals_shared.stream_inactive.send(sender=self.__class__,
-                                                stream=str(self.stream),
-                                                param=None
-                                                )
-
-
-    def get_absolute_url(self):
-        return reverse('config:stream_detail', kwargs={'pk': self.pk})
-
-    def class_name(self):
-        return _('stream_class_name')
-
-    def __str__(self):
-        return str(self.name)
-
-
-pre_delete.connect(handlers.remove_obj_perms_connected_with_user, sender=Stream)
-
-
-class SRSNode(models.Model):
-    name = models.CharField(max_length=100, help_text=_('srsnode_name_help'))
-    api_base = models.CharField(max_length=256, help_text=_('srsnode_api_base_help'))
-    rtmp_base = models.CharField(max_length=256, help_text=_('srsnode_rtmp_base_help'))
-    active = models.BooleanField(help_text=_('srsnode_active_help'))
-
-    class Meta:
-        verbose_name = _('srsnode_verbose_name')
-        verbose_name_plural = _('srsnode_verbose_name_plural')
-
-    def __str__(self):
-        return self.name
-
-
-class SRSStreamInstance(models.Model):
-    node = models.ForeignKey(SRSNode, on_delete=models.CASCADE, help_text=_('srsstreaminstance_node_help'))
-    stream = models.ForeignKey(Stream, on_delete=models.CASCADE, help_text=_('srsstreaminstance_stream_help'))
-    last_update = models.DateTimeField(auto_now=True, help_text=_('srsstreaminstance_last_update_help'))
-    statusdata = models.TextField(default="{}", help_text=_('srsstreaminstance_statusdata_help'))
-
-    class Meta:
-        verbose_name = _('srsstreaminstance_verbose_name')
-        verbose_name_plural = _('srsstreaminstance_verbose_name_plural')
-
-    def __str__(self):
-        return f"{self.stream} on {self.node}"
-
-
-class Pull(models.Model):
-    stream = models.ForeignKey(Stream, on_delete=models.CASCADE, help_text=_('pull_stream_help'))
-    source = models.CharField(max_length=500, validators=[validate_stream_url], help_text=_('pull_source_help'))
-    active = models.BooleanField(help_text=_('pull_activate_help'))
-    name = models.CharField(max_length=100, help_text=_('pull_name_help'))
-
-    class Meta:
-        verbose_name = _('pull_verbose_name')
-        verbose_name_plural = _('pull_verbose_name_plural')
-
-    def class_name(self):
-        return _('pull_class_name')
-
-    def get_absolute_url(self):
-        return reverse('config:pull_detail', kwargs={'pk': self.pk})
-
-    def __str__(self):
-        return str(self.name)
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        if self.active:
-            signals_shared.pull_active.send(
-                sender=self.__class__,
-                pull_id=self.id,
-            )
-        else:
-            signals_shared.pull_inactive.send(
-                sender=self.__class__,
-                pull_id=self.id,
-            )
-
-    def get_concierge_configuration(self):
-        if not self.active:
-            return None
-
-        # Select a random node that is active to ingest the pulled stream.
-        node = SRSNode.objects.filter(active=True).order_by('?').first()
-
-        return {
-            "type": "pull",
-            "active": self.active,
-            "name": self.name,
-            "source": self.source,
-            "target": f"{node.rtmp_base}/{settings.GLOBAL_STREAM_NAMESPACE}/{self.stream.stream}",
-        }
-
-
-pre_delete.connect(handlers.remove_obj_perms_connected_with_user, sender=Pull)
-
-
-class Restream(models.Model):
-    FORMATS = (
-        ('flv', 'flv (RTMP)'),
-        ('mpegts', 'mpegts (SRT)'),
-    )
-    stream = models.ForeignKey(Stream, on_delete=models.CASCADE, help_text=_('restream_stream_help'))
-    target = models.CharField(max_length=500, validators=[validate_stream_url], help_text=_('restream_target_help'))
-    name = models.CharField(max_length=100, help_text=_('restream_name_help'))
-    active = models.BooleanField(help_text=_('restream_activate_help'))
-    format = models.CharField(max_length=6, choices=FORMATS, default='flv', help_text=_('restream_format_help'))
-
-    class Meta:
-        verbose_name = _('restream_verbose_name')
-        verbose_name_plural = _('restream_verbose_name_plural')
-
-    def class_name(self):
-        return _('restream_class_name')
-
-    def get_absolute_url(self):
-        return reverse('config:restream_detail', kwargs={'pk': self.pk})
-
-    def __str__(self):
-        return '{} to {}'.format(self.stream, self.name)
-
-    def get_concierge_configuration(self):
-        stream_instances = SRSStreamInstance.objects.filter(stream=self.stream).all()
-
-        if not stream_instances:
-            return None
-
-        # We use the actual SRS node of the first stream instance to make sure
-        # that we use the same node for the restreaming. This avoids unnecessary
-        # traffic between the SRS nodes. In theory a clustered SRS setup could
-        # provide the same stream on all edges, but that would mean east-west
-        # traffic between the nodes.
-
-        # This assumption breaks when a second stream instance appears on another
-        # SRS node, and only afterwards the first stream instance is removed.
-        # In that case, the restreaming would not be retriggered, and the edge
-        # would automatically start pulling the stream from the other SRS node.
-
-        # It's a tradeoff between stability and efficiency. We choose stability.
-        rtmp_base = stream_instances[0].node.rtmp_base
-
-        return {
-            'config_version': 1,
-            'stream_source_url': f"{rtmp_base}/{settings.GLOBAL_STREAM_NAMESPACE}/{self.stream.stream}",
-            'stream_target_url': self.target,
-            'stream_target_transport': self.format,
-        }
-
-
-pre_delete.connect(handlers.remove_obj_perms_connected_with_user, sender=Restream)
--- a/source/config/signals.py
+++ b/source/config/signals.py
@ -1,46 +0,0 @@
-import json
-
-from django.dispatch import receiver
-from django.db.models.signals import post_save, post_delete
-
-from config.models import Restream, Stream
-from config.signals_shared import stream_active, stream_inactive
-from concierge.models import Task
-
-@receiver(stream_active)
-def create_restream_tasks(sender, **kwargs):
-    stream = Stream.objects.get(stream=kwargs['stream'])
-    restreams = Restream.objects.filter(active=True, stream=stream)
-    for restream in restreams:
-        Task.objects.get_or_create(stream=restream.stream, type='restream', config_id=restream.id,
-                    configuration=json.dumps(restream.get_concierge_configuration()))
-
-
-@receiver(post_save, sender=Restream)
-def update_restream_tasks(sender, **kwargs):
-    instance = kwargs['instance']
-    # TODO: check for breaking changes using update_fields. This needs custom save_model functions though.
-
-    # Get the current task instance if it exists, and remove it
-    try:
-        task = Task.objects.filter(type='restream', config_id=instance.id).get()
-        task.delete()
-    except Task.DoesNotExist:
-        pass
-
-    # If the configuration is set to be active, and the stream is published, (re)create new task
-    if instance.active and instance.stream.publish_counter > 0:
-        task = Task(stream=instance.stream, type='restream', config_id=instance.id,
-                    configuration=json.dumps(instance.get_concierge_configuration()))
-        task.save()
-
-
-@receiver(post_delete, sender=Restream)
-def delete_restream_tasks(sender, **kwargs):
-    instance = kwargs['instance']
-    # Get the current task instance if it exists, and remove it
-    try:
-        task = Task.objects.filter(type='restream', config_id=instance.id).get()
-        task.delete()
-    except Task.DoesNotExist:
-        pass
--- a/source/config/signals/pull.py
+++ b/source/config/signals/pull.py
@ -1,46 +0,0 @@
-import json
-
-from django.dispatch import receiver
-from django.db.models.signals import post_save, post_delete
-
-from config.models import Stream, Pull
-from config.signals_shared import stream_active, stream_inactive, pull_active, pull_inactive
-from concierge.models import Task
-
-@receiver(pull_active)
-def create_pull_tasks_on_activate(sender, **kwargs):
-    pull = Pull.objects.get(id=kwargs['pull_id'])
-    Task.objects.get_or_create(stream=pull.stream, type='pull', config_id=pull.id,
-        configuration=json.dumps(pull.get_concierge_configuration()))
-
-
-@receiver(pull_inactive)
-def delete_pull_tasks_on_inactivate(sender, **kwargs):
-    pull = Pull.objects.get(id=kwargs['pull_id'])
-    Task.objects.filter(type='pull', config_id=pull.id).delete()
-
-
-@receiver(post_save, sender=Pull)
-def update_pull_tasks(sender, **kwargs):
-    instance = kwargs['instance']
-
-    try:
-        task = Task.objects.filter(type='pull', config_id=instance.id).get()
-        task.delete()
-    except Task.DoesNotExist:
-        pass
-
-    if instance.active:
-        task = Task(stream=instance.stream, type='pull', config_id=instance.id,
-                    configuration=json.dumps(instance.get_concierge_configuration()))
-        task.save()
-
-@receiver(post_delete, sender=Pull)
-def delete_pull_tasks(sender, **kwargs):
-    instance = kwargs['instance']
-    # Get the current task instance if it exists, and remove it
-    try:
-        task = Task.objects.filter(type='pull', config_id=instance.id).get()
-        task.delete()
-    except Task.DoesNotExist:
-        pass
--- a/source/config/signals/restream.py
+++ b/source/config/signals/restream.py
@ -1,46 +0,0 @@
-import json
-
-from django.dispatch import receiver
-from django.db.models.signals import post_save, post_delete
-
-from config.models import Restream, Stream
-from config.signals_shared import stream_active, stream_inactive
-from concierge.models import Task
-
-@receiver(stream_active)
-def create_restream_tasks(sender, **kwargs):
-    stream = Stream.objects.get(stream=kwargs['stream'])
-    restreams = Restream.objects.filter(active=True, stream=stream)
-    for restream in restreams:
-        Task.objects.get_or_create(stream=restream.stream, type='restream', config_id=restream.id,
-                    configuration=json.dumps(restream.get_concierge_configuration()))
-
-
-@receiver(post_save, sender=Restream)
-def update_restream_tasks(sender, **kwargs):
-    instance = kwargs['instance']
-    # TODO: check for breaking changes using update_fields. This needs custom save_model functions though.
-
-    # Get the current task instance if it exists, and remove it
-    try:
-        task = Task.objects.filter(type='restream', config_id=instance.id).get()
-        task.delete()
-    except Task.DoesNotExist:
-        pass
-
-    # If the configuration is set to be active, and the stream is published, (re)create new task
-    if instance.active and instance.stream.publish_counter > 0:
-        task = Task(stream=instance.stream, type='restream', config_id=instance.id,
-                    configuration=json.dumps(instance.get_concierge_configuration()))
-        task.save()
-
-
-@receiver(post_delete, sender=Restream)
-def delete_restream_tasks(sender, **kwargs):
-    instance = kwargs['instance']
-    # Get the current task instance if it exists, and remove it
-    try:
-        task = Task.objects.filter(type='restream', config_id=instance.id).get()
-        task.delete()
-    except Task.DoesNotExist:
-        pass
--- a/Show More
+++ b/Show More