diff --git a/vikunja/.env.sample b/vikunja/.env.sample deleted file mode 100644 index 677e294..0000000 --- a/vikunja/.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -#MySQL Datenbank -MYSQL_USER=changeMe -MYSQL_PASS=changeMe -MYSQL_ROOT_PASS=changeMe \ No newline at end of file diff --git a/vikunja/docker-compose.yml b/vikunja/docker-compose.yml deleted file mode 100644 index 133624e..0000000 --- a/vikunja/docker-compose.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: '2' - -services: - db: - image: mariadb:10 - container_name: vikunja_db - command: - --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci - environment: - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASS} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASS} - MYSQL_DATABASE: vikunja - volumes: - - ./db:/var/lib/mysql - restart: unless-stopped - - api: - image: vikunja/api:latest - container_name: vikunja_api - environment: - VIKUNJA_DATABASE_HOST: db - VIKUNJA_DATABASE_PASSWORD: ${MYSQL_PASS} - VIKUNJA_DATABASE_TYPE: mysql - VIKUNJA_DATABASE_USER: ${MYSQL_USER} - VIKUNJA_DATABASE_DATABASE: vikunja - VIKUNJA_SERVICE_JWTSECRET: - ports: - - 3457:3456 - depends_on: - - db - volumes: - - ./files:/app/vikunja/files - restart: unless-stopped - - frontend: - image: vikunja/frontend - container_name: vikunja_app - ports: - - 8003:80 - environment: - VIKUNJA_API_URL: http://192.168.0.111:3457/api/v1 - restart: unless-stopped \ No newline at end of file diff --git a/webserver/.env.sample b/webserver/.env.sample deleted file mode 100644 index 1f80ca1..0000000 --- a/webserver/.env.sample +++ /dev/null @@ -1,8 +0,0 @@ -#MySQL Datenbank -MYSQL_USER=changeMe -MYSQL_PASSWORD=changeMe -MYSQL_ROOT_PASSWORD=changeMe - -NFS_SERVER=192.168.0.xxx # oder hostname oder Domain -PFAD_1=/Pfad/zum/Ordner/www -PFAD_2=/Pfad/zum/Ordner/energie \ No newline at end of file diff --git a/webserver/Dockerfile b/webserver/Dockerfile deleted file mode 100644 index b4ec956..0000000 --- a/webserver/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM php:7.4.3-apache -#FROM php:apache - -RUN apt-get update \ -&& apt-get install -y \ -libfreetype6-dev \ -libjpeg62-turbo-dev \ -libpng-dev \ -libzip-dev \ -&& a2enmod rewrite \ -&& a2enmod headers - -RUN docker-php-ext-configure gd --with-freetype --with-jpeg -RUN docker-php-ext-install opcache gd pdo_mysql zip - -# Backup, falls mysqli nicht funktioniert -RUN docker-php-ext-install mysqli - -RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf -RUN service apache2 restart \ No newline at end of file diff --git a/webserver/docker-compose.yml b/webserver/docker-compose.yml deleted file mode 100644 index 65c1a84..0000000 --- a/webserver/docker-compose.yml +++ /dev/null @@ -1,61 +0,0 @@ -version: "3" - -services: - webserver: - container_name: webserver - build: . - ports: - - 8180:80 - user: "www-data:www-data" - environment: - - TZ=Europe/Berlin - volumes: - - www:/var/www/html - - energie:/var/www/html/knx/archiv - - /etc/localtime:/etc/localtime:ro - labels: - - com.centurylinklabs.watchtower.enable="false" - restart: unless-stopped - - database: - image: mariadb:latest - container_name: webserver_mariadb - ports: - - 3309:3306 - environment: - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - - TZ=Europe/Berlin - volumes: - - ./dbdata:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - - phpmyadmin: - image: phpmyadmin/phpmyadmin - container_name: webserver_phpmyadmin - environment: - - TZ=Europe/Berlin - links: - - 'database:db' - ports: - - 8087:80 - restart: unless-stopped - -volumes: - www: - name: www - driver: local - driver_opts: - type: nfs - o: addr=${NFS_SERVER},rw - device: ":${PFAD_1}" - - energie: - name: energie - driver: local - driver_opts: - type: nfs - o: addr=${NFS_SERVER},rw - device: ":${PFAD_2}" \ No newline at end of file