From aea048a22a205cf9f8489e4560001f6629185e47 Mon Sep 17 00:00:00 2001 From: mwinter Date: Fri, 14 Apr 2023 12:59:48 +0200 Subject: [PATCH] fixing restheart reverse proxy bug and final configs for migration --- docker-compose.yml | 15 +++++++-------- nginx/vhost.d/default | 10 ---------- portfolio/.dockerignore | 12 ++++++++++++ portfolio/{src => }/Dockerfile | 0 portfolio/src/public/javascripts/global.js | 5 +---- portfolio/src/views/index.jade | 4 ++-- 6 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 portfolio/.dockerignore rename portfolio/{src => }/Dockerfile (100%) diff --git a/docker-compose.yml b/docker-compose.yml index bcd117e..8f217e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: portfolio: # TODO: This will eventually be rewritten with something like VUE container_name: portfolio - build: ./src/portfolio + build: ./portfolio # To just server running the following command #command: bash -c "npm run serve" # To reinstall the packages run the following command instead @@ -169,7 +169,7 @@ services: #/fileRealmAuthenticator/users[userid='admin']/password->'${PASSWORD}'; - VIRTUAL_HOST=${DOMAIN},*.${DOMAIN},restheart.${DOMAIN},api.${DOMAIN} - VIRTUAL_PATH=/api/ - - VIRTUAL_DEST=/ + - VIRTUAL_DEST=/api/ - VIRTUAL_PORT=8080 depends_on: mongo: @@ -242,8 +242,9 @@ services: container_name: nextcloud restart: always volumes: - - ./nextcloud/data:/var/www/html/data - - nextcloud:/var/www/html + #- ./nextcloud/data:/var/www/html/data + #- nextcloud:/var/www/html + - ./nextcloud/html:/var/www/html environment: - MYSQL_DATABASE=nextcloud - MYSQL_USER=${USER} @@ -252,6 +253,7 @@ services: - NEXTCLOUD_ADMIN_USER=${USER} - NEXTCLOUD_ADMIN_PASSWORD=${PASSWORD} - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN} *.${DOMAIN} cloud.${DOMAIN} nextcloud.${DOMAIN} #localdev.${DOMAIN} + - NEXTCLOUD_INIT_LOCK=true #- APACHE_DISABLE_REWRITE_IP=1 #- TRUSTED_PROXIES=nginx-proxy #- OVERWRITEHOST=${DOMAIN}:8888 @@ -273,9 +275,6 @@ services: #redis: ports: - 8888:80 - - 8443:443 - #expose: - # - 8888 mysql-nextcloud: image: mariadb:10 @@ -296,6 +295,6 @@ services: volumes: nginx: - nextcloud: + #nextcloud: acme: portfolio: diff --git a/nginx/vhost.d/default b/nginx/vhost.d/default index 8b24925..89ad815 100644 --- a/nginx/vhost.d/default +++ b/nginx/vhost.d/default @@ -1,12 +1,2 @@ -## Start of configuration add by letsencrypt container -location ^~ /.well-known/acme-challenge/ { - auth_basic off; - auth_request off; - allow all; - root /usr/share/nginx/html; - try_files $uri =404; - break; -} -## End of configuration add by letsencrypt container include /etc/nginx/bots.d/ddos.conf; include /etc/nginx/bots.d/blockbots.conf; diff --git a/portfolio/.dockerignore b/portfolio/.dockerignore new file mode 100644 index 0000000..fe566ca --- /dev/null +++ b/portfolio/.dockerignore @@ -0,0 +1,12 @@ +# Ignore everything +* + +# Allow files and directories +!/src + +# Ignore unnecessary files inside allowed directories +# This should go after the allowed directories +**/*~ +**/*.log +**/.DS_Store +**/Thumbs.db diff --git a/portfolio/src/Dockerfile b/portfolio/Dockerfile similarity index 100% rename from portfolio/src/Dockerfile rename to portfolio/Dockerfile diff --git a/portfolio/src/public/javascripts/global.js b/portfolio/src/public/javascripts/global.js index f4d34dc..8857709 100644 --- a/portfolio/src/public/javascripts/global.js +++ b/portfolio/src/public/javascripts/global.js @@ -89,10 +89,7 @@ $("img").load(function() { }); // Functions ============================================================= -//BASE_URL='https://restheart.unboundedpress.org'; -//BASE_URL='https://dev2.unboundedpress.org'; -//http://127.0.0.1:8080/api/ -BASE_URL='http://127.0.0.1:8080/api'; +BASE_URL = window.location.origin + '/api' function resetDivHeights(){ diff --git a/portfolio/src/views/index.jade b/portfolio/src/views/index.jade index 391ba8a..eba957a 100644 --- a/portfolio/src/views/index.jade +++ b/portfolio/src/views/index.jade @@ -15,7 +15,7 @@ block content li a#aboutbutton(class='scroll-to-div', href='#about', data-target='about') about li - a(href='https://gitea.unboundedpress.org/', target='_blank') code + a(href='/code', target='_blank') code div#gallery.header-section div.header-inner @@ -113,7 +113,7 @@ block content div#bio h3#abouthead about div#aboutme - p My work often explores simple processes where dynamic systems, situations, and settings are realized in a variety of ways from performances to installations. To me, everything we experience is computable. Given this digital philosophy, I acknowledge even my most open works as algorithmic; and, while not always apparent on the surface of any given piece, the considerations of computability and epistemology are integral to my practice. I often reconcile epistemological limits with artistic practicality by considering and addressing the limits of computation from an artistic and experiential vantage point and by collaborating with other artists, mathematicians, and scientists in order to integrate objects, ideas, and texts from various domains as structural elements in my pieces. + p My work often explores simple processes where dynamic systems, situations, and settings are realized in a variety of ways from performances to installations. To me, everything we experience is computable. Given this digital philosophy, I acknowledge even my most open works as algorithmic; and, while not always apparent on the surface of any given piece, the considerations of computability and epistemology are integral to my practice. I often reconcile epistemological limits with artistic practicality by considering and addressing the limits of computation from an artistic and experiential vantage point and by collaborating with other artists, mathematicians, and scientists in order to integrate objects, ideas, and texts from various domains as structural elements in my pieces. p My work has been presented at venues and festivals throughout the world such as REDCAT, in Los Angeles; the Ostrava Festival of New Music in the Czech Republic; Tsonami Arte Sonoro Festival in Valparaiso, Chile; the Huddersfield New Music Festival in the United Kingdom; and Umbral Sesiones at the Museo de Arte Contemporáneo in Oaxaca, Mexico. Recordings of my music have been released by Another Timbre, New World Records, Edition Wandelweiser, Bahn Mi Verlag, Tsonami Records, and Pogus Productions. From 2018 to 2019, I was a fellow / artist-in-residence at the Akademie Schloss Solitude in Stuttgart, Germany. In 2008, I co-founded the wulf., a Los Angeles-based organization dedicated to experimental performance and art. As a laboratory and hub for exploring new ideas, the wulf. has become an experiment in alternative communities and economies. Similarly, my work subverts discriminatory conventions and hierarchies by exploring alternative forms of presentation and interaction. div#mc_embed_signup br