Browse Source

draft of a panel

boyska 5 years ago
parent
commit
e9f7c44ec0
4 changed files with 12 additions and 3 deletions
  1. 1 0
      .agignore
  2. 8 0
      docker-compose.yml
  3. 2 2
      docker/frontend-apache.conf
  4. 1 1
      panel

+ 1 - 0
.agignore

@@ -0,0 +1 @@
+vendor/

+ 8 - 0
docker-compose.yml

@@ -27,6 +27,7 @@ services:
             - APACHE_SERVER_NAME=tt-rss
             - PHP_DISPLAY_ERRORS=stdout
             - PHP_DISPLAY_STARTUP_ERROR=1
+        ports: ['8010:80']
 
     tt-rss-update:
         image: feedati/tt-rss:latest
@@ -81,6 +82,13 @@ services:
             context:
                 ./panel/
         container_name: feedati_panel
+        environment:
+            - PANEL_PREFIX=/panel/
+            - PANEL_ALLOWED_NAME=feedati-fe
+        volumes:
+            - ./panel/panelui/res/:/go/src/git.lattuga.net/boyska/feedpanel/panelui/res/
+        #debug
+        ports: ['8011:8000']
 
 volumes:
     postgres_data:

+ 2 - 2
docker/frontend-apache.conf

@@ -221,8 +221,8 @@ Require all granted
 </Location>
 
 <Location /panel/>
-ProxyPass http://panel:8000/panel/
-ProxyPassReverse http://panel:8000/panel/
+ProxyPass http://panel:8000/
+ProxyPassReverse http://panel:8000/
 Use Auth
 Require valid-user
 RewriteEngine on

+ 1 - 1
panel

@@ -1 +1 @@
-Subproject commit de1dc86be153684495fa6cec3d85ae6bcf1c9895
+Subproject commit 762dc2305d64f320ca0ad9ab2be036b312b2b376