aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2020-08-06 16:09:28 -0300
committerEuAndreh <eu@euandre.org>2020-08-06 16:09:28 -0300
commitd586d2907cefd64ddd99c6aaa5c6d5cba64da4e6 (patch)
tree0b0600aa285a39acf09dbce435f9d5bd23489166
parentAlign Ansible with_items list (diff)
downloadtoph-d586d2907cefd64ddd99c6aaa5c6d5cba64da4e6.tar.gz
toph-d586d2907cefd64ddd99c6aaa5c6d5cba64da4e6.tar.xz
Remove gpodder.net sync software from the server
-rw-r--r--TODOs.org5
-rw-r--r--docker-compose.env.yaml20
-rw-r--r--dockerfiles/gpodder/Dockerfile17
-rw-r--r--provision.env.yaml6
-rw-r--r--secrets/secret-envrc.shbin2933 -> 2536 bytes
-rw-r--r--vps.tf12
6 files changed, 4 insertions, 56 deletions
diff --git a/TODOs.org b/TODOs.org
index a6afec8..1918e8a 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -24,7 +24,10 @@ CLOSED: [2020-08-05 mer. 07:00]
https://zingmars.info/2019/12/29/Running-a-personal-Matrix-server-using-docker/
https://matrix.org/docs/guides/free-small-matrix-server
https://jonnev.se/matrix-homeserver-with-docker/
-** TODO =gpodder.$tld=: gpodder.net sync service
+** CANCELLED =gpodder.$tld=: gpodder.net sync service
+Instead use a desktop application (like gPodder itself) to manage podcasts and export episodes to then phone when needed.
+
+This solution not only doesn't require internet access, but also it removes the mainteinance of additional software on the server.
** TODO =git.$tld=: git-instaweb (or cgit) server with repositories from ~/dev/libre/
** TODO =mail.$tld=: postfix, dovecot, spamassasin, opendkim, etc
No need for roundcube, Nextcloud has a web interface client.
diff --git a/docker-compose.env.yaml b/docker-compose.env.yaml
index 415567c..8785b68 100644
--- a/docker-compose.env.yaml
+++ b/docker-compose.env.yaml
@@ -78,23 +78,3 @@ services:
- LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
networks:
- nginx-proxy-network
-
- gpodder:
- build:
- context: ./dockerfiles/gpodder
- container_name: gpodder
- restart: "no"
- volumes:
- - "${VOLUME_HOME}/applications/gpodder/mygpo:/usr/src/mygpo"
- ports:
- - "${GPODDER_PORT}:8000"
- environment:
- - VIRTUAL_HOST=${GPODDER_TLD}
- - VIRTUAL_PORT=${GPODDER_PORT}
- - LETSENCRYPT_HOST=${GPODDER_TLD}
- - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
- - SECRET_KEY=${GPODDER_SECRET_KEY}
- - DEFAULT_BASE_URL=http://localhost:8000/
- - DEBUG=False
- networks:
- - nginx-proxy-network
diff --git a/dockerfiles/gpodder/Dockerfile b/dockerfiles/gpodder/Dockerfile
deleted file mode 100644
index c32239a..0000000
--- a/dockerfiles/gpodder/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM python:3.6
-
-WORKDIR /usr/src/
-
-RUN git clone git://github.com/gpodder/mygpo.git
-
-RUN apt-get install libpq-dev libjpeg-dev zlib1g-dev libwebp-dev libffi-dev
-
-WORKDIR /usr/src/mygpo
-
-RUN pip install -r requirements.txt
-
-EXPOSE 8000
-
-RUN pip install gunicorn celery django-celery-beat
-
-CMD [ "gunicorn", "-b", ":8000", "mygpo.wsgi" ]
diff --git a/provision.env.yaml b/provision.env.yaml
index 50b97b4..8c3e1c8 100644
--- a/provision.env.yaml
+++ b/provision.env.yaml
@@ -19,11 +19,6 @@
src: /mnt/${VPS_VOLUME_NAME}
dest: /home/vps/volumes
state: link
- - name: Create required Dockerfile directory
- file:
- path: /home/vps/dockerfiles/gpodder/
- state: directory
- mode: '0755'
- name: Create required vhost conf directory
file:
path: /home/vps/volumes/vhost-conf
@@ -38,7 +33,6 @@
- { src: './secrets/borg/known-hosts.txt', dest: '/root/.ssh/known_hosts', mode: '400' }
- { src: './scripts/box/bash-profile.sh', dest: '/root/.bash_profile', mode: '400' }
- { src: './generated/docker-compose.yaml', dest: '/home/vps/docker-compose.yaml', mode: '400' }
- - { src: './dockerfiles/gpodder/Dockerfile', dest: '/home/vps/dockerfiles/gpodder/Dockerfile', mode: '400' }
- { src: './nextcloud-vhost.conf', dest: '/home/vps/volumes/vhost-conf/${NEXTCLOUD_TLD}', mode: '400' }
- name: Restore borg backup when we have a fresh volume
shell: /home/vps/restore-backup.sh
diff --git a/secrets/secret-envrc.sh b/secrets/secret-envrc.sh
index 80fd2f0..8a136ba 100644
--- a/secrets/secret-envrc.sh
+++ b/secrets/secret-envrc.sh
Binary files differ
diff --git a/vps.tf b/vps.tf
index c359e24..8579e76 100644
--- a/vps.tf
+++ b/vps.tf
@@ -15,11 +15,6 @@ variable "nextcloud_tld_prefix" {
description = "DNS prefix used for the Nextcloud installation. Does not contain a dot at the end."
}
-variable "gpodder_tld_prefix" {
- type = string
- description = "DNS prefix used for the gpodder.net installation. Does not contain a dot at the end."
-}
-
variable "hostname" {
type = string
description = "Human name of the host. This is a pet name, not cattle name :)"
@@ -117,10 +112,3 @@ resource "digitalocean_record" "nextcloud" {
name = var.nextcloud_tld_prefix
value = "${digitalocean_domain.vps_tld.name}."
}
-
-resource "digitalocean_record" "gpodder" {
- domain = digitalocean_domain.vps_tld.name
- type = "CNAME"
- name = var.gpodder_tld_prefix
- value = "${digitalocean_domain.vps_tld.name}."
-}