Merge pull request #35 from startersclan/refactor/move-source-directo…

…ries-to-.-src

Refactor: Move source directories to ./src

.gitignore

@@ -1,7 +1,7 @@
 /.idea
-/web/.idea
+/src/web/.idea
 /.vscode/*
 !/.vscode/launch.json
 /.vagrant
-/web/hlstatsimg/progress
-/web/hlstatsimg/graph
+/src/web/hlstatsimg/progress
+/src/web/hlstatsimg/graph

Dockerfile.daemon

@@ -10,7 +10,7 @@ RUN set -eux; \
     gzip -d /GeoLite2-City.mmdb.gz;
 
 # Copy scripts and set permissions
-COPY scripts /scripts
+COPY ./src/scripts /scripts
 RUN set -eux; \
     mv -v /GeoLiteCity.dat /scripts/GeoLiteCity/GeoLiteCity.dat; \
     mv -v /GeoLite2-City.mmdb /scripts/GeoLiteCity/GeoLite2-City.mmdb; \

Dockerfile.web

@@ -3,13 +3,13 @@ FROM $IMAGE AS build
 
 # Set permissions for 'www-data' user
 # COPY --chown=www-data:www-data --chmod=640  /web /web
-COPY ./web /web
+COPY ./src/web /web
 RUN set -eux; \
     chown -R www-data:www-data /web; \
     find /web -type d -exec chmod 750 {} \; ; \
     find /web -type f -exec chmod 640 {} \; ;
 
-COPY ./heatmaps /heatmaps
+COPY ./src/heatmaps /heatmaps
 RUN set -eux; \
     chown -R www-data:www-data /heatmaps; \
     find /heatmaps -type d -exec chmod 750 {} \; ; \

README.md

@@ -64,7 +64,7 @@ echo '127.0.0.1 web.example.com' | sudo tee -a /etc/hosts
 echo '127.0.0.1 phpmyadmin.example.com' | sudo tee -a /etc/hosts
 ```
 
-- [install.sql](./sql/install.sql) is mounted in `mysql` container which automatically installs the DB only on the first time. If you prefer not to mount `install.sql`, you may manually install the DB by logging into PHPMyAdmin and importing the `install.sql` there.
+- [install.sql](./src/sql/install.sql) is mounted in `mysql` container which automatically installs the DB only on the first time. If you prefer not to mount `install.sql`, you may manually install the DB by logging into PHPMyAdmin and importing the `install.sql` there.
 - `traefik` serves HTTPS with a self-signed cert. All HTTP requests are redirected to HTTPS.
 
 ### Upgrading (docker)

docker-compose.example.yml

@@ -116,7 +116,7 @@ services:
       - MYSQL_DATABASE=hlstatsxce
     volumes:
       - db-volume:/var/lib/mysql
-      - ./sql/install.sql:/docker-entrypoint-initdb.d/install.sql:ro  # This seeds the DB only on the first time
+      - ./src/sql/install.sql:/docker-entrypoint-initdb.d/install.sql:ro  # This seeds the DB only on the first time
     networks:
       - default
 

docker-compose.yml

@@ -122,7 +122,7 @@ services:
       - MYSQL_DATABASE=hlstatsxce
     volumes:
       - db-volume:/var/lib/mysql
-      - ./sql/install.sql:/docker-entrypoint-initdb.d/install.sql:ro  # This seeds the DB only on the first time
+      - ./src/sql/install.sql:/docker-entrypoint-initdb.d/install.sql:ro  # This seeds the DB only on the first time
     networks:
       - default
 
@@ -135,7 +135,7 @@ services:
       context: .
       target: dev
     volumes:
-      - ./web:/web
+      - ./src/web:/web
       # - ./config/web/supervisor.conf:/supervisor.conf:ro
       # - ./config/web/etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       # - ./config/web/usr/local/etc/php/conf.d/php.ini:/usr/local/etc/php/conf.d/php.ini:ro
@@ -165,8 +165,8 @@ services:
       context: .
       target: dev
     volumes:
-      - ./heatmaps:/heatmaps
-      - ./web:/web
+      - ./src/heatmaps:/heatmaps
+      - ./src/web:/web
     environment:
       - DB_HOST=db
       - DB_NAME=hlstatsxce
@@ -216,7 +216,7 @@ services:
   init-container:
     image: alpine:latest
     volumes:
-      - ./web:/web
+      - ./src/web:/web
       - db-volume:/var/lib/mysql
     networks:
       - default