diff --git a/.gitignore b/.gitignore index 435fce4..b0ca21f 100644 --- a/.gitignore +++ b/.gitignore @@ -71,7 +71,7 @@ log/ # logs/ae_app/ logs/apache2/ logs/mailman2/ -logs/php7/ +# logs/php7/ # logs/web/ tmp/ temp/ @@ -99,3 +99,16 @@ srv/hosted_tmp_dev_link/ srv/hosted_tmp_dev_link srv/hosted_tmp_link/ srv/hosted_tmp_link + +srv/aether_api_ln/ +srv/aether_api_ln +srv/aether_app_ln/ +srv/aether_app_ln +srv/hosted_files_dev_ln/ +srv/hosted_files_dev_ln +srv/hosted_files_ln/ +srv/hosted_files_ln +srv/hosted_tmp_dev_ln/ +srv/hosted_tmp_dev_ln +srv/hosted_tmp_ln/ +srv/hosted_tmp_ln \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0956bdc..da5fb19 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,8 +24,8 @@ services: - ./srv/html_php:/srv/html_php - ./srv/oneskyit_site:/srv/oneskyit_site - - ./srv/hosted_files_dev_link:/srv/hosted_files - - ./srv/hosted_tmp_dev_link:/srv/hosted_tmp + - ./srv/hosted_files_ln:/srv/hosted_files + - ./srv/hosted_tmp_ln:/srv/hosted_tmp # NOTE: Nextcloud Docker container requires (sort of) the path to be /var/www/html # - ./srv/nextcloud:/srv/nextcloud @@ -245,9 +245,9 @@ services: # - ./logs/ae_api/aether_api.log.5:/logs/aether_api.log.5 # - ./logs/ae_api/aether_api_warning.log:/logs/aether_api_warning.log - - ./srv/aether_api_link:/srv/aether_api - - ./srv/hosted_files_dev_link:/srv/hosted_files - - ./srv/hosted_tmp_dev_link:/srv/hosted_tmp + - ./srv/aether_api_ln:/srv/aether_api + - ./srv/hosted_files_ln:/srv/hosted_files + - ./srv/hosted_tmp_ln:/srv/hosted_tmp # links: # - redis depends_on: @@ -281,9 +281,9 @@ services: # - ./logs/aether_flask_gunicorn_error.log:/logs/gunicorn_error.log # - ./logs/aether_app.log:/logs/aether_app.log # - ./logs/aether_app_warning.log:/logs/aether_app_warning.log - - ./srv/aether_app_link:/srv/aether_app - - ./srv/hosted_files_dev_link:/srv/hosted_files - - ./srv/hosted_tmp_dev_link:/srv/hosted_tmp + - ./srv/aether_app_ln:/srv/aether_app + - ./srv/hosted_files_ln:/srv/hosted_files + - ./srv/hosted_tmp_ln:/srv/hosted_tmp depends_on: - aether_api_gunicorn stdin_open: true # docker run -i diff --git a/logs/php7/.gitignore b/logs/php7/.gitignore new file mode 100644 index 0000000..9ce0361 --- /dev/null +++ b/logs/php7/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except for this file +!.gitignore \ No newline at end of file diff --git a/srv/README.md b/srv/README.md index 8bb638b..a6abb08 100644 --- a/srv/README.md +++ b/srv/README.md @@ -5,4 +5,19 @@ Create links to the actual file directories ./srv/mariadb ./srv/nextcloud ./srv/oneskyit_site -./srv/static_files \ No newline at end of file +./srv/static_files + +## Create links examples +### Flask App +ln -s ~/OSIT_dev/aether_app ~/OSIT_dev/aether_container_env/srv/aether_app_ln + +### FastAPI API +ln -s ~/OSIT_dev/aether_api_fastapi ~/OSIT_dev/aether_container_env/srv/aether_api_ln + +### Hosted tmp files +ln -s /mnt/data_drive/srv/data/osit_app/hosted_tmp /home/scott/OSIT_dev/aether_container_env/srv/hosted_tmp_ln +ln -s /mnt/data_drive/srv/data/osit_app/hosted_tmp_dev /home/scott/OSIT_dev/aether_container_env/srv/hosted_tmp_ln + +### Hosted (hashed) files +ln -s /mnt/data_drive/srv/data/osit_app/hosted_files /home/scott/OSIT_dev/aether_container_env/srv/hosted_files_ln +ln -s /mnt/data_drive/srv/data/osit_app/hosted_files_dev /home/scott/OSIT_dev/aether_container_env/srv/hosted_files_ln \ No newline at end of file