From eb80dc26a19c3ab52bc299d758d81186af65cbab Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Fri, 23 Apr 2021 22:58:44 -0400
Subject: [PATCH] cleanup config files

---
 .do/deploy.template.yaml   | 46 --------------------------------------
 .flake8                    |  6 -----
 archivebox/.flake8         |  2 +-
 bin/lint.sh                |  3 ++-
 etc/cron.d/ArchiveBox      |  1 -
 etc/fly.toml               | 40 +++++++++++++++++++++++++++++++++
 etc/{nginx => }/nginx.conf |  0
 uwsgi.ini => etc/uwsgi.ini |  0
 8 files changed, 43 insertions(+), 55 deletions(-)
 delete mode 100644 .do/deploy.template.yaml
 delete mode 100644 .flake8
 delete mode 100644 etc/cron.d/ArchiveBox
 create mode 100644 etc/fly.toml
 rename etc/{nginx => }/nginx.conf (100%)
 rename uwsgi.ini => etc/uwsgi.ini (100%)

diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
deleted file mode 100644
index e4b50002..00000000
--- a/.do/deploy.template.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-spec:
-  name: archivebox
-  services:
-  - name: archivebox
-    git:
-      branch: dev
-      repo_clone_url: https://github.com/ArchiveBox/ArchiveBox.git
-    dockerfile_path: Dockerfile
-    source_dir: ./
-    instance_count: 1
-    routes:
-    - path: /
-    http_port: 8000
-    health_check:
-      http_path: /admin/login/
-    envs:
-    - key: ALLOWED_HOSTS
-      scope: RUN_AND_BUILD_TIME
-      value: '*'
-    - key: SAVE_ARCHIVE_DOT_ORG
-      scope: RUN_AND_BUILD_TIME
-      value: "True"
-    - key: SAVE_MEDIA
-      scope: RUN_AND_BUILD_TIME
-      value: "True"
-    - key: TIMEOUT
-      scope: RUN_AND_BUILD_TIME
-      value: "120"
-    - key: MEDIA_TIMEOUT
-      scope: RUN_AND_BUILD_TIME
-      value: "3600"
-    - key: PUBLIC_INDEX
-      scope: RUN_AND_BUILD_TIME
-      value: "True"
-    - key: PUBLIC_SNAPSHOTS
-      scope: RUN_AND_BUILD_TIME
-      value: "True"
-    - key: PUBLIC_ADD_VIEW
-      scope: RUN_AND_BUILD_TIME
-      value: "False"
-    - key: CHECK_SSL_VALIDITY
-      scope: RUN_AND_BUILD_TIME
-      value: "False"
-    - key: MEDIA_MAX_SIZE
-      scope: RUN_AND_BUILD_TIME
-      value: 750m
diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 01af646d..00000000
--- a/.flake8
+++ /dev/null
@@ -1,6 +0,0 @@
-[flake8]
-ignore = D100,D101,D102,D103,D104,D105,D202,D203,D205,D400,E131,E241,E252,E266,E272,E701,E731,W293,W503,W291,W391
-select = F,E9,W
-max-line-length = 130
-max-complexity = 10
-exclude = migrations,tests,node_modules,vendor,venv,.venv,.venv2,.docker-venv
diff --git a/archivebox/.flake8 b/archivebox/.flake8
index dd6ba8e4..01af646d 100644
--- a/archivebox/.flake8
+++ b/archivebox/.flake8
@@ -3,4 +3,4 @@ ignore = D100,D101,D102,D103,D104,D105,D202,D203,D205,D400,E131,E241,E252,E266,E
 select = F,E9,W
 max-line-length = 130
 max-complexity = 10
-exclude = migrations,tests,node_modules,vendor,static,venv,.venv,.venv2,.docker-venv
+exclude = migrations,tests,node_modules,vendor,venv,.venv,.venv2,.docker-venv
diff --git a/bin/lint.sh b/bin/lint.sh
index 605f966d..bd8beef8 100755
--- a/bin/lint.sh
+++ b/bin/lint.sh
@@ -15,7 +15,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
 source "$DIR/.venv/bin/activate"
 
 echo "[*] Running flake8..."
-flake8 archivebox && echo "√ No errors found."
+cd archivebox
+flake8 . && echo "√ No errors found."
 
 echo
 
diff --git a/etc/cron.d/ArchiveBox b/etc/cron.d/ArchiveBox
deleted file mode 100644
index aa878a97..00000000
--- a/etc/cron.d/ArchiveBox
+++ /dev/null
@@ -1 +0,0 @@
-0 24 * * * www-data /opt/ArchiveBox/bin/archive "https://getpocket.com/users/example/feed/all" >> /var/log/ArchiveBox.log
diff --git a/etc/fly.toml b/etc/fly.toml
new file mode 100644
index 00000000..1dec7cb5
--- /dev/null
+++ b/etc/fly.toml
@@ -0,0 +1,40 @@
+# fly.toml file generated for archivebox on 2021-04-23T16:35:11-04:00
+
+app = "archivebox"
+
+kill_signal = "SIGINT"
+kill_timeout = 5
+
+[env]
+
+[mounts]
+source="archivebox_data"
+destination="/data"
+
+[experimental]
+  auto_rollback = true
+
+[[services]]
+  http_checks = []
+  internal_port = 8000
+  protocol = "tcp"
+  script_checks = []
+
+  [services.concurrency]
+    hard_limit = 25
+    soft_limit = 20
+    type = "connections"
+
+  [[services.ports]]
+    handlers = ["http"]
+    port = 80
+
+  [[services.ports]]
+    handlers = ["tls", "http"]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 6
+    timeout = "2s"
diff --git a/etc/nginx/nginx.conf b/etc/nginx.conf
similarity index 100%
rename from etc/nginx/nginx.conf
rename to etc/nginx.conf
diff --git a/uwsgi.ini b/etc/uwsgi.ini
similarity index 100%
rename from uwsgi.ini
rename to etc/uwsgi.ini