From 3fc653687cf1c3747570a206aeb9b68478298a0d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Nov 2019 06:15:02 +0100
Subject: [PATCH] Fix files.

---
 .../apache-firefly-iii.conf}                  |  0
 .deploy/docker/{ => local-build}/apache2.conf |  0
 .deploy/docker/{ => local-build}/cacert.pem   |  0
 .deploy/docker/vhost.conf                     | 26 -------------------
 .travis.yml                                   |  3 +--
 Dockerfile.arm64                              |  6 ++---
 6 files changed, 4 insertions(+), 31 deletions(-)
 rename .deploy/docker/{apache-firefly.conf => local-build/apache-firefly-iii.conf} (100%)
 rename .deploy/docker/{ => local-build}/apache2.conf (100%)
 rename .deploy/docker/{ => local-build}/cacert.pem (100%)
 delete mode 100644 .deploy/docker/vhost.conf

diff --git a/.deploy/docker/apache-firefly.conf b/.deploy/docker/local-build/apache-firefly-iii.conf
similarity index 100%
rename from .deploy/docker/apache-firefly.conf
rename to .deploy/docker/local-build/apache-firefly-iii.conf
diff --git a/.deploy/docker/apache2.conf b/.deploy/docker/local-build/apache2.conf
similarity index 100%
rename from .deploy/docker/apache2.conf
rename to .deploy/docker/local-build/apache2.conf
diff --git a/.deploy/docker/cacert.pem b/.deploy/docker/local-build/cacert.pem
similarity index 100%
rename from .deploy/docker/cacert.pem
rename to .deploy/docker/local-build/cacert.pem
diff --git a/.deploy/docker/vhost.conf b/.deploy/docker/vhost.conf
deleted file mode 100644
index f5a07256b0..0000000000
--- a/.deploy/docker/vhost.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-server {
-    listen 80 default_server;
-
-    server_name  _ *.vm docker;
-
-    root "/app/public";
-    index index.php;
-
-    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
-    listen 443 default_server;
-
-    server_name  _ *.vm docker;
-
-    root "/app/public";
-    index index.php;
-
-    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-    include /opt/docker/etc/nginx/vhost.ssl.conf;
-}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 847918548f..14e8f25903 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ jobs:
       env: ARCH=arm64 VERSION=4.8.1.8
 
 script:
-  - .deploy/docker/travis.sh
-  # enable experimental features.
   - echo $TRAVIS_DIST
   - echo $ARCH
+  - .deploy/docker/travis.sh
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 99c593b670..3f397ee8a9 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -21,13 +21,13 @@ RUN a2enmod rewrite && a2enmod ssl && \
     sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
 
 # copy ca certs to correct location
-COPY ./cacert.pem /usr/local/ssl/cert.pem
+COPY ./.deploy/docker/local-build/cacert.pem /usr/local/ssl/cert.pem
 
 # copy Apache config to correct spot.
-COPY ./apache2.conf /etc/apache2/apache2.conf
+COPY ./.deploy/docker/local-build/apache2.conf /etc/apache2/apache2.conf
 
 # Enable default site (Firefly III)
-COPY ./apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf
+COPY ./.deploy/docker/local-build/apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf
 
 # See also: https://github.com/JC5/firefly-iii-base-image