diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,8 @@ _site .sass-cache .vagrant -_config.yml # general .DS_Store Thumbs.db -ehthumbs.db \ No newline at end of file +ehthumbs.db diff --git a/Dockerfile b/Dockerfile --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,6 @@ COPY Gemfile.lock Gemfile.lock RUN bundle install COPY . . -RUN mv _config-prod.yml _config.yml RUN bundle exec jekyll build # Hosting Layer diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -5,20 +5,9 @@ PROJECT ?= PORT ?= 8080 -APP_ENV=dev default: container -.PHONY: _config.yml -_config.yml: - cp _config-$(APP_ENV).yml _config.yml - -prod: APP_ENV=prod -prod: _config.yml - -dev: APP_ENV=dev -dev: _config.yml - .PHONY: container container: docker build -t $(PROJECT)bitcoinabcorg . diff --git a/_config-dev.yml b/_config-dev.yml deleted file mode 100644 --- a/_config-dev.yml +++ /dev/null @@ -1,183 +0,0 @@ -# --- General options --- # - -# url is the full website URL -# baseurl is the website's URL without the hostname -url: "http://www.bitcoinabc.org" -baseurl: "" - -# Name of website -title: Bitcoin ABC - -# Short description of your site -description: Bitcoin ABC - Software for Bitcoin Cash nodes - -# --- Navigation bar options --- # - -# List of links in the navigation bar -navbar-links: - Latest Roadmap: "https://www.bitcoincash.org/roadmap.html" - Announcements: "announcements/" - Download: - - Binaries: "https://download.bitcoinabc.org/latest/" - - Source Code: "https://github.com/Bitcoin-ABC/bitcoin-abc" - - Ubuntu Packages: "https://launchpad.net/~bitcoin-abc/+archive/ubuntu/ppa" - - Archived Binaries: "https://download.bitcoinabc.org/" - Contributing: "https://github.com/Bitcoin-ABC/bitcoin-abc/blob/master/CONTRIBUTING.md" - -supported-languages: - en: "English" - es: "Español" - fr: "Français" - jp: "日本語" - ko: "한국어" - nl: "Nederlands" - pt: "Português" - ru: "русский" - zh_simple: "简体中文" - zh_traditional: "繁体中文" - -# Image to show in the navigation bar - image must be a square (width = height) -# Remove this parameter if you don't want an image in the navbar -#avatar: "/img/avatar-icon.png" - -# If you want to have an image logo in the top-left corner instead of the title text, -# then specify the following parameter -title-img: "/img/avatar-icon-small.png" - -# --- Background colour/image options --- # - -# Personalize the colors in your website. Colour values can be any valid CSS colour - -navbar-col: "#F5F5F5" -navbar-text-col: "#404040" -navbar-children-col: "#F5F5F5" -page-col: "#FFFFFF" -link-col: "#008AFF" -hover-col: "#0085A1" -footer-col: "#F5F5F5" -footer-text-col: "#777777" -footer-link-col: "#404040" - -# Alternatively, the navbar, footer, and page background can be set to use background images -# instead of colour - -# navbar-img: "/img/bgimage.png" -# footer-img: "/img/bgimage.png" -# page-img: "/img/bgimage.png" - -# --- Footer options --- # - -# Change all these values or delete the ones you don't want. -# Important: you must keep the "name" parameter, everything else you can remove -author: - name: Bitcoin ABC - -# Select your active Social Network Links. -# Uncomment the links you want to show in the footer and add your information to each link. -# You can reorder the items to define the link order. -# If you want to add a new link that isn't here, you'll need to also edit the file _data/SocialNetworks.yml -social-network-links: - email: "info@bitcoinabc.org" - facebook: bitcoinabcorg - github: bitcoin-abc - twitter: bitcoin_abc -# reddit: yourname -# google-plus: +DeanAttali -# linkedin: daattali -# xing: yourname -# stackoverflow: "3943160/daattali" -# snapchat: deanat78 -# instagram: deanat78 -# youtube: user/deanat78 -# spotify: yourname -# telephone: +14159998888 -# steam: deanat78 -# twitch: yourname -# yelp: yourname - -# Select which share links to show in posts -share-links-active: - twitter: true - facebook: true - google: false - linkedin: true - -# How to display the link to the website in the footer -# Remove this if you don't want a link in the footer -url-pretty: "bitcoinabc.org" # eg. "deanattali.com/beautiful-jekyll" - -# --- Web Statistics Section --- # - -# Fill in your Google Analytics ID to track your website using GA -#google_analytics: "" - -# Google Tag Manager ID -#gtm: "" - -# --- Misc --- # -# Facebook App ID -# fb_app_id: "" - -# Excerpt Word Length -# Truncates the excerpt to the specified number of words on the index page -excerpt_length: 30 - -# Number of announcements to appear on the front page -front_page_posts: 2 - -# Character used to separate site title and description in HTML document title -# and RSS feed title -title-separator: "-" - -# --- Don't need to touch anything below here (but you can if you want) --- # - -# Output options (more information on Jekyll's site) -timezone: "America/Vancouver" -markdown: kramdown -highlighter: rouge -permalink: /:year-:month-:day-:title/ -paginate: 5 - -kramdown: - input: GFM - -# Default YAML values (more information on Jekyll's site) -defaults: - - - scope: - path: "" - type: "posts" - values: - layout: "post" - comments: true # add comments to all blog posts - social-share: true # add social media sharing buttons to all blog posts - - - scope: - path: "" # all files - values: - layout: "page" - show-avatar: true - -# Use tags index page and make tags on each post clickable -link-tags: true - -# Exclude these files from production site -exclude: - - CHANGELOG.md - - CNAME - - docker-compose.yml - - Dockerfile - - Gemfile - - Gemfile.lock - - LICENSE - - README.md - - Vagrantfile - - nginx.conf - - Makefile - - Rakefile - -plugins: - - jekyll-paginate - -# Beautiful Jekyll / Dean Attali -# 2fc73a3a967e97599c9763d05e564189 diff --git a/_config-prod.yml b/_config-prod.yml deleted file mode 100644 --- a/_config-prod.yml +++ /dev/null @@ -1,183 +0,0 @@ -# --- General options --- # - -# url is the full website URL -# baseurl is the website's URL without the hostname -url: "http://www.bitcoinabc.org" -baseurl: "" - -# Name of website -title: Bitcoin ABC - -# Short description of your site -description: Bitcoin ABC - Software for Bitcoin Cash nodes - -# --- Navigation bar options --- # - -# List of links in the navigation bar -navbar-links: - Latest Roadmap: "https://www.bitcoincash.org/roadmap.html" - Announcements: "announcements/" - Download: - - Binaries: "https://download.bitcoinabc.org/latest/" - - Source Code: "https://github.com/Bitcoin-ABC/bitcoin-abc" - - Ubuntu Packages: "https://launchpad.net/~bitcoin-abc/+archive/ubuntu/ppa" - - Archived Binaries: "https://download.bitcoinabc.org/" - Contributing: "https://github.com/Bitcoin-ABC/bitcoin-abc/blob/master/CONTRIBUTING.md" - -supported-languages: - en: "English" - es: "Español" - fr: "Français" - jp: "日本語" - ko: "한국어" - nl: "Nederlands" - pt: "Português" - ru: "русский" - zh_simple: "简体中文" - zh_traditional: "繁体中文" - -# Image to show in the navigation bar - image must be a square (width = height) -# Remove this parameter if you don't want an image in the navbar -#avatar: "/img/avatar-icon.png" - -# If you want to have an image logo in the top-left corner instead of the title text, -# then specify the following parameter -title-img: "/img/avatar-icon-small.png" - -# --- Background colour/image options --- # - -# Personalize the colors in your website. Colour values can be any valid CSS colour - -navbar-col: "#F5F5F5" -navbar-text-col: "#404040" -navbar-children-col: "#F5F5F5" -page-col: "#FFFFFF" -link-col: "#008AFF" -hover-col: "#0085A1" -footer-col: "#F5F5F5" -footer-text-col: "#777777" -footer-link-col: "#404040" - -# Alternatively, the navbar, footer, and page background can be set to use background images -# instead of colour - -# navbar-img: "/img/bgimage.png" -# footer-img: "/img/bgimage.png" -# page-img: "/img/bgimage.png" - -# --- Footer options --- # - -# Change all these values or delete the ones you don't want. -# Important: you must keep the "name" parameter, everything else you can remove -author: - name: Bitcoin ABC - -# Select your active Social Network Links. -# Uncomment the links you want to show in the footer and add your information to each link. -# You can reorder the items to define the link order. -# If you want to add a new link that isn't here, you'll need to also edit the file _data/SocialNetworks.yml -social-network-links: - email: "info@bitcoinabc.org" - facebook: bitcoinabcorg - github: bitcoin-abc - twitter: bitcoin_abc -# reddit: yourname -# google-plus: +DeanAttali -# linkedin: daattali -# xing: yourname -# stackoverflow: "3943160/daattali" -# snapchat: deanat78 -# instagram: deanat78 -# youtube: user/deanat78 -# spotify: yourname -# telephone: +14159998888 -# steam: deanat78 -# twitch: yourname -# yelp: yourname - -# Select which share links to show in posts -share-links-active: - twitter: true - facebook: true - google: false - linkedin: true - -# How to display the link to the website in the footer -# Remove this if you don't want a link in the footer -url-pretty: "bitcoinabc.org" # eg. "deanattali.com/beautiful-jekyll" - -# --- Web Statistics Section --- # - -# Fill in your Google Analytics ID to track your website using GA -#google_analytics: "" - -# Google Tag Manager ID -#gtm: "" - -# --- Misc --- # -# Facebook App ID -# fb_app_id: "" - -# Excerpt Word Length -# Truncates the excerpt to the specified number of words on the index page -excerpt_length: 30 - -# Number of announcements to appear on the front page -front_page_posts: 2 - -# Character used to separate site title and description in HTML document title -# and RSS feed title -title-separator: "-" - -# --- Don't need to touch anything below here (but you can if you want) --- # - -# Output options (more information on Jekyll's site) -timezone: "America/Vancouver" -markdown: kramdown -highlighter: rouge -permalink: /:year-:month-:day-:title/ -paginate: 5 - -kramdown: - input: GFM - -# Default YAML values (more information on Jekyll's site) -defaults: - - - scope: - path: "" - type: "posts" - values: - layout: "post" - comments: true # add comments to all blog posts - social-share: true # add social media sharing buttons to all blog posts - - - scope: - path: "" # all files - values: - layout: "page" - show-avatar: true - -# Use tags index page and make tags on each post clickable -link-tags: true - -# Exclude these files from production site -exclude: - - CHANGELOG.md - - CNAME - - docker-compose.yml - - Dockerfile - - Gemfile - - Gemfile.lock - - LICENSE - - README.md - - Vagrantfile - - nginx.conf - - Makefile - - Rakefile - -plugins: - - jekyll-paginate - -# Beautiful Jekyll / Dean Attali -# 2fc73a3a967e97599c9763d05e564189