diff --git a/apache/conf/gfa-status.conf b/apache/conf/gfa-status.conf new file mode 100644 index 0000000..5bdfea7 --- /dev/null +++ b/apache/conf/gfa-status.conf @@ -0,0 +1,32 @@ + + ServerName gfa-status.web.psi.ch + ServerAlias www.gfa-status.web.psi.ch + DocumentRoot /var/www/gfa-status.web.psi.ch/web + + ErrorLog /proc/self/fd/2 + CustomLog /proc/self/fd/1 combined + + Header set Access-Control-Allow-Origin "*" + + # PHP configuration + + SetHandler application/x-httpd-php + + + php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@gfa-status.web.psi.ch" + php_admin_value upload_tmp_dir /var/www/clients/client45/web70/tmp + php_admin_value session.save_path /var/www/clients/client45/web70/tmp + php_admin_value open_basedir /var/www/clients/client45/web70/web:/var/www/clients/client45/web70/private:/var/www/clients/client45/web70/tmp:/var/www/gfa-status.web.psi.ch/web:/tmp:/usr/share/php:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/www/error/ + + + Options +FollowSymLinks +Includes + AllowOverride All + Require all granted + + # SSI support + AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + + + + diff --git a/docker-compose.yaml b/docker-compose.yaml index 16fc00f..d468e87 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -24,14 +24,16 @@ services: - public - backend + # rfwtools + # gfa-status-test apache: image: gitea.psi.ch/images/php-apache:latest container_name: apache_app restart: always volumes: - /opt/webcontent/rfmwtools:/var/www/rfmwtools:ro - - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro - + - /opt/webcontent/gfa-status:/var/www/gfa-status:ro + - ./apache/conf/:/etc/apache2/sites-enabled/:ro networks: - backend @@ -133,17 +135,6 @@ services: networks: - hedgedoc_backend - # Andreas Luedeke - # POC not running yet - gfa-status-test: - image: php:8.2-apache - container_name: gfa-status-test - volumes: - - /opt/webcontent/gfa-status/web:/var/www/html - restart: always - networks: - - backend - # Flechsig Uwe # opticswiki (test setup) # I assume gitea.psi.ch/images is the local image repository filled docker push