From 453ed163a63422aec10fb3c1243c7b13af49449f Mon Sep 17 00:00:00 2001 From: Dana Merrick Date: Sat, 30 Jan 2021 16:44:48 -0500 Subject: [PATCH 1/2] Removing old infra stuff --- .gitignore | 1 - Gemfile | 2 - cloudformation/route53-zone.yaml | 18 --- ...-website-with-cloudfront-and-route-53.yaml | 120 ------------------ s3_website.yml | 91 ------------- 5 files changed, 232 deletions(-) delete mode 100644 cloudformation/route53-zone.yaml delete mode 100644 cloudformation/s3-static-website-with-cloudfront-and-route-53.yaml delete mode 100644 s3_website.yml diff --git a/.gitignore b/.gitignore index 738cdf4..4d3f44b 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,5 @@ design/favicon-atom.psd # No need to commit these /bin /ignore -s3_website.jar design diff --git a/Gemfile b/Gemfile index 44fa781..1b561f4 100644 --- a/Gemfile +++ b/Gemfile @@ -46,5 +46,3 @@ gem 'builder' # For parsing Markdown gem 'redcarpet' - -gem 's3_website' diff --git a/cloudformation/route53-zone.yaml b/cloudformation/route53-zone.yaml deleted file mode 100644 index 5f82309..0000000 --- a/cloudformation/route53-zone.yaml +++ /dev/null @@ -1,18 +0,0 @@ -AWSTemplateFormatVersion: '2010-09-09' -Description: Creates an Amazon Route 53 hosted zone -Parameters: - DomainName: - Type: String - Description: The DNS name of an Amazon Route 53 hosted zone e.g. jevsejev.io - AllowedPattern: (?!-)[a-zA-Z0-9-.]{1,63}(? -s3_secret: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> -s3_bucket: <%= ENV['STATIC_SITE_BUCKET'] %> - -# set session_token if using temporary credentials with a session token (eg: when assuming a role) -# session_token: YOUR_AWS_S3_SESSION_TOKEN - -# Below are examples of all the available configurations. -# See README for more detailed info on each of them. - -site: build - -index_document: index.html -error_document: 404.html - -cache_control: - 'assets/*': public, max-age=86400 - #TODO: confirm this works - '*.jpg': public, max-age=86400 - '*.png': public, max-age=86400 - 'favicon.ico': public, max-age=86400 - 'browserconfig.xml': public, max-age=86400 - 'robots.txt': public, max-age=86400 - 'humans.txt': public, max-age=86400 - '*': no-cache, no-store - -# gzip: -# - .html -# - .css -# - .md -# gzip_zopfli: true - -# See http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region for valid endpoints -# s3_endpoint: ap-northeast-1 - -# ignore_on_server: that_folder_of_stuff_i_dont_keep_locally - -# exclude_from_upload: -# - those_folders_of_stuff -# - i_wouldnt_want_to_upload - -# reduces the cost of storing things on S3 -s3_reduced_redundancy: true - -cloudfront_distribution_id: <%= ENV['STATIC_SITE_CLOUDFRONT'] %> - -# cloudfront_distribution_config: -# default_cache_behavior: -# min_ttl: <%= 60 * 60 * 24 %> -# aliases: -# quantity: 1 -# items: -# - your.website.com - -# cloudfront_invalidate_root: true - -cloudfront_wildcard_invalidation: true - -# concurrency_level: 5 - -redirects: - # I shared this URL with a buncha NERT members - radio: 2017/10/11/san-francisco-emergency-radio-setup - # for convenience - fb: https://www.facebook.com/adanalifeblog - facebook: https://www.facebook.com/adanalifeblog - youtube: https://www.youtube.com/channel/UC8Q7uFC1Xyr2ZnTWOk9Aizg - instagram: https://instagram.com/adanalife_ - twitter: https://twitter.com/adanalife_ - twitch: https://twitch.tv/adanalife_ - # I renamed these articles - 2018/03/05/trip-recap-central-coast: 2018/03/05/trip-report-central-coast - 2019/01/13/eleven-month-update/: 2019/01/13/post-adventure-summary - # in case people try to change the number and expect it to work - 2017/10/01/how-this-site-works-p-2: 2017/10/12/how-this-site-works-p-2 - 2017/10/12/how-this-site-works-p-1: 2017/10/01/how-this-site-works - # this was posted on my flyer - van-tour: https://youtu.be/_own6DuEpLc - # the stream survey - survey: https://forms.gle/a52NamfEfCcSP7Vc9 - -# routing_rules: -# - condition: -# key_prefix_equals: blog/some_path -# redirect: -# host_name: blog.example.com -# replace_key_prefix_with: some_new_path/ -# http_redirect_code: 301 From 92875d0110b0618e57dfd0661f3b270d5f632a8e Mon Sep 17 00:00:00 2001 From: Dana Merrick Date: Sat, 30 Jan 2021 16:57:11 -0500 Subject: [PATCH 2/2] Removing more stuff --- Gemfile.lock | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b903d4c..6acc363 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,11 +18,6 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) awesome_print (1.8.0) - aws-sdk (1.67.0) - aws-sdk-v1 (= 1.67.0) - aws-sdk-v1 (1.67.0) - json (~> 1.4) - nokogiri (~> 1) backports (3.17.2) builder (3.2.4) coderay (1.1.3) @@ -30,12 +25,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - colored (1.2) concurrent-ruby (1.1.6) - configure-s3-website (1.5.5) - deep_merge (= 1.0.0) contracts (0.13.0) - deep_merge (1.0.0) dotenv (2.7.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) @@ -47,7 +38,6 @@ GEM fast_blank (1.0.0) fastimage (2.1.7) ffi (1.13.1) - filey-diff (2.0.0) fspath (3.1.2) haml (5.1.2) temple (>= 0.8.0) @@ -70,7 +60,6 @@ GEM image_optim (~> 0.19) image_size (2.0.2) in_threads (1.5.4) - json (1.8.6) kramdown (1.17.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) @@ -132,7 +121,6 @@ GEM rouge (~> 3.2) middleman-title (1.0.0) middleman-core (>= 4.0) - mime-types (1.25.1) mini_magick (4.10.1) mini_portile2 (2.4.0) minitest (5.14.1) @@ -158,20 +146,9 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) rouge (3.20.0) - s3_website (1.7.6) - aws-sdk (~> 1) - configure-s3-website (= 1.5.5) - erubis (~> 2.7.0) - filey-diff (~> 2.0.0) - mime-types (~> 1) - simple-cloudfront-invalidator (~> 1) - thor (= 0.18.1) - zopfli (~> 0.0.3) sassc (2.4.0) ffi (~> 1.9) servolux (0.13.0) - simple-cloudfront-invalidator (1.1.0) - colored (= 1.2) temple (0.8.2) thor (0.18.1) thread_safe (0.3.6) @@ -180,7 +157,6 @@ GEM thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - zopfli (0.0.7) PLATFORMS ruby @@ -202,7 +178,6 @@ DEPENDENCIES middleman-title nokogiri redcarpet - s3_website BUNDLED WITH 2.1.4