about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2023-08-14 19:21:30 -0700
committerFranck Cuny <franck@fcuny.net>2023-08-14 19:21:30 -0700
commitb310c113f76fd415ffbbbef8c51914e94c915797 (patch)
treeadd17fe80cec40ab7aa3d8917f97a3784e2eed0e
parentchanging permissions result in failure (diff)
downloadfcuny.net-b310c113f76fd415ffbbbef8c51914e94c915797.tar.gz
remove unused configurations
Remove the configuration for fly.io and the configuration for Caddy
since I'm running this on GitHub pages now.

Remove unused targets from the flake configuration and drop the pandoc
dependency. The resume is just a web page accessible at [1].

[1] https://fcuny.net/resume.html
-rw-r--r--Caddyfile20
-rw-r--r--flake.nix24
-rw-r--r--fly.toml41
-rw-r--r--static/css/resume.css72
4 files changed, 1 insertions, 156 deletions
diff --git a/Caddyfile b/Caddyfile
deleted file mode 100644
index 40c143e..0000000
--- a/Caddyfile
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-        http_port 8080
-        auto_https off
-}
-
-localhost:8080 {
-        root * {$SITE_ROOT}
-        encode gzip
-        file_server
-}
-
-http://fcunynet.fly.dev {
-        redir https://fcuny.net
-}
-
-http://fcuny.net {
-        root * {$SITE_ROOT}
-        encode gzip
-        file_server
-}
diff --git a/flake.nix b/flake.nix
index 308ba1a..3906fbe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,6 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        caddyfile = ./Caddyfile;
       in
       {
         packages = {
@@ -19,34 +18,13 @@
               pname = "fcuny.net";
               version = self.lastModifiedDate;
               src = ./.;
-              buildInputs = [ hugo git pandoc texlive.combined.scheme-tetex ];
+              buildInputs = [ hugo git ];
               buildPhase = ''
                 mkdir -p $out
                 ${pkgs.hugo}/bin/hugo --minify --destination $out
-                ${pkgs.pandoc}/bin/pandoc --self-contained --css static/css/resume.css \
-                  --from org --to html --output $out/resume.html content/resume.org
-                ${pkgs.pandoc}/bin/pandoc --self-contained --css static/css/resume.css \
-                  --from org --to pdf --output $out/resume.pdf content/resume.org
               '';
               dontInstall = true;
             };
-          container = pkgs.dockerTools.buildLayeredImage {
-            name = self.packages."${system}".site.pname;
-            tag = self.packages."${system}".site.version;
-            config = {
-              Cmd = [ "${pkgs.caddy}/bin/caddy" "run" "--adapter" "caddyfile" "--config" "${caddyfile}" ];
-              Env = [
-                "SITE_ROOT=${self.packages."${system}".site}"
-              ];
-            };
-          };
-          deploy = pkgs.writeShellScriptBin "deploy" ''
-            set -euxo pipefail
-            export PATH="${pkgs.lib.makeBinPath [(pkgs.docker.override { clientOnly = true; }) pkgs.flyctl]}:$PATH"
-            archive=${self.packages.x86_64-linux.container}
-            image=$(docker load < $archive | tail -n1 | ${pkgs.gawk}/bin/awk '{ print $3; }')
-            flyctl deploy --image $image --local-only
-          '';
           hugo = pkgs.writeShellScriptBin "hugo" ''
             set -euo pipefail
             export PATH=${pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git ]}
diff --git a/fly.toml b/fly.toml
deleted file mode 100644
index d9a891f..0000000
--- a/fly.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-# fly.toml file generated for fcunynet on 2021-06-20T10:01:50-07:00
-
-app = "fcunynet"
-
-kill_signal = "SIGINT"
-kill_timeout = 5
-
-[build]
-  builtin = "hugo-static"
-
-[env]
-
-[experimental]
-  allowed_public_ports = []
-  auto_rollback = true
-
-[[services]]
-  http_checks = []
-  internal_port = 8080
-  protocol = "tcp"
-  script_checks = []
-
-  [services.concurrency]
-    hard_limit = 25
-    soft_limit = 20
-    type = "connections"
-
-  [[services.ports]]
-    handlers = ["http"]
-    port = 80
-    force_https = true
-
-  [[services.ports]]
-    handlers = ["tls", "http"]
-    port = 443
-
-  [[services.tcp_checks]]
-    grace_period = "1s"
-    interval = "15s"
-    restart_limit = 6
-    timeout = "2s"
diff --git a/static/css/resume.css b/static/css/resume.css
deleted file mode 100644
index 13ed9b3..0000000
--- a/static/css/resume.css
+++ /dev/null
@@ -1,72 +0,0 @@
-body {
-  font-family: sans-serif;
-  font-size: 1em;
-  line-height: 1.8em;
-  color: #0e0e0b;
-  margin: 1em auto;
-  padding: 0 0.55em;
-  max-width: 50rem;
-}
-
-h1 {
-  color: #0e0e0b;
-  font-size: 1.3rem;
-}
-
-h2, h3 {
-  border-bottom: 1px solid #eee;
-  font-style: italic;
-}
-h2 {
-  margin-top: 1.25em;
-  margin-bottom: 0.41em;
-  font-size: 1.2rem;
-}
-h3 {
-  margin-top: 1.5em;
-  margin-bottom: 0.5em;
-  font-size: 1rem;
-}
-
-hr{
-  color:#000111;
-  background-color:#000111;
-  border:none;
-  height:1px
-}
-
-a {
-  color:#047bc2;
-  transition:color .1s ease-in-out;
-}
-
-table {
-  width: 100%;
-  border-spacing: 0px;
-  outline: none;
-}
-td{
-  padding-right: 0.7em;
-}
-td:last-child {
-  text-align: right;
-}
-table, th, td {
-  font-family: monospace;
-  color: #000;
-}
-
-#title-block-header {
-  padding-right: 10px;
-  font-size: 1.4em;
-  display: flex;
-  font-family: monospace;
-  justify-content: space-between;
-  align-items: center;
-  padding-top: 0.5rem;
-  border-bottom: 1px;
-}
-
-#experience {
-  padding-top: 20px;
-}