diff --git a/ansible/main.yml b/ansible/main.yml index 4350aff..4f9f3f5 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -99,7 +99,6 @@ - hosts: walker roles: - nebula - - upload - plausible - restic - commento diff --git a/ansible/roles/upload/files/docker-compose.yml b/ansible/roles/upload/files/docker-compose.yml deleted file mode 100644 index 326e771..0000000 --- a/ansible/roles/upload/files/docker-compose.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: "2.3" - -services: - webdav: - image: ghcr.io/realorangeone/webdav:latest - restart: unless-stopped - volumes: - - ./files:/srv - - ./htpasswd.txt:/etc/nginx/.htpasswd:ro - environment: - - PUID={{ docker_user.id }} - labels: - - traefik.enable=true - - traefik.http.routers.upload.rule=Host(`upload.theorangeone.net`) - networks: - - default - - traefik - - img: - image: ghcr.io/realorangeone/static-server:latest - restart: unless-stopped - volumes: - - ./files/img:/srv:ro - environment: - - PUID={{ docker_user.id }} - labels: - - traefik.enable=true - - traefik.http.routers.img.rule=Host(`img.theorangeone.net`) - networks: - - default - - traefik - - dl: - image: ghcr.io/realorangeone/static-server:latest - restart: unless-stopped - volumes: - - ./files/dl:/srv:ro - environment: - - PUID={{ docker_user.id }} - labels: - - traefik.enable=true - - traefik.http.routers.dl.rule=Host(`dl.theorangeone.net`) - networks: - - default - - traefik - -networks: - traefik: - external: true diff --git a/ansible/roles/upload/handlers/main.yml b/ansible/roles/upload/handlers/main.yml deleted file mode 100644 index d6b56f2..0000000 --- a/ansible/roles/upload/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart upload - shell: - chdir: /opt/upload - cmd: "{{ docker_update_command }}" diff --git a/ansible/roles/upload/tasks/main.yml b/ansible/roles/upload/tasks/main.yml deleted file mode 100644 index 873ea7c..0000000 --- a/ansible/roles/upload/tasks/main.yml +++ /dev/null @@ -1,37 +0,0 @@ -- name: Include variables - include_vars: upload.yml - -- name: Create install directory - file: - path: /opt/upload - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install compose file - template: - src: files/docker-compose.yml - dest: /opt/upload/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: docker-compose -f %s config - notify: restart upload - become: true - -- name: Create superuser - htpasswd: - path: /opt/upload/htpasswd.txt - name: jake - password: "{{ superuser_upload_password }}" - mode: "640" - owner: "{{ docker_user.name }}" - become: true - -- name: Create nextcloud user - htpasswd: - path: /opt/upload/htpasswd.txt - name: nextcloud - password: "{{ nextcloud_upload_password }}" - mode: "640" - become: true diff --git a/ansible/roles/upload/vars/upload.yml b/ansible/roles/upload/vars/upload.yml deleted file mode 100644 index 91d5535..0000000 --- a/ansible/roles/upload/vars/upload.yml +++ /dev/null @@ -1,22 +0,0 @@ -superuser_upload_password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 63356130643562363439663563393639623238383562353861653635346566343036386439303836 - 3739346133396462333462633731366435353666336563350a626664363730653765373861376132 - 62623732656565356436333663653137643936663033616539326536336636346339613962376165 - 3966623337343566370a666135616561626331626333343532336662373638376662663762383835 - 62373363303534306533656166303131656464633635613165663234373333656637383137353566 - 37393938633036633833363135663038643661636131663337393332353339326566376637643831 - 35653262313266633231646437366638646462366133653833633139383061326336343238363464 - 62393137303862353636333033323536393466326337373761396539316265333133356632363233 - 32366663303765303663633564633564323465633366333064393330666261646465 -nextcloud_upload_password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 36373734636338636332333730366564316432643566653063663664656262393261383030343339 - 3239373334666466326235383739336335326339393634650a336462303730313339393637333132 - 37653938613463353965396533326330626266643261656538356464303534663737303630373864 - 3761623163393130310a313736343763393264346566316332393634393036383632653930616663 - 62303934346366646262393261356636633131393762376438393363646663646263386634366664 - 33613332623135626437393130353966336563303364303536323537343765643063616166616639 - 63366565653037653432336265623863323039356436353631633830366334643037633237376361 - 38653934663762353563343431333664366662306531653562363065373431323565643931303563 - 65336666316138643130383231313961396666376239303533616561633863616135 diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index 58d0be6..26c4271 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -117,14 +117,6 @@ resource "cloudflare_record" "theorangeonenet_srv_matrix" { } } -resource "cloudflare_record" "theorangeonenet_img" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "img" - value = cloudflare_record.sys_domain_walker.hostname - type = "CNAME" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_matrix" { zone_id = cloudflare_zone.theorangeonenet.id name = "matrix" @@ -133,22 +125,6 @@ resource "cloudflare_record" "theorangeonenet_matrix" { ttl = 1 } -resource "cloudflare_record" "theorangeonenet_dl" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "dl" - value = cloudflare_record.sys_domain_walker.hostname - type = "CNAME" - ttl = 1 -} - -resource "cloudflare_record" "theorangeonenet_upload" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "upload" - value = cloudflare_record.sys_domain_walker.hostname - type = "CNAME" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_plausible" { zone_id = cloudflare_zone.theorangeonenet.id name = "plausible"