From 2bcc3207553f54126582eb7aea1738eda4f2c07d Mon Sep 17 00:00:00 2001 From: Steve Ayerhart Date: Mon, 23 Nov 2020 21:50:53 -0500 Subject: [PATCH] add makefile and reorg --- Makefile | 18 ++++++++++++++++++ nginx/music.ayerh.art.conf | 8 ++++---- {content => public/ayerh.art}/index.html | 4 ++-- {js => public/ayerh.art/scripts}/waves.js | 0 .../music.ayerh.art/images}/digital.jpg | Bin .../music.ayerh.art/images}/vintage.jpg | Bin .../music.ayerh.art/images}/vinyl.jpg | Bin .../steve.ayerh.art}/about/index.html | 2 +- .../steve.ayerh.art}/index.html | 2 +- 9 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 Makefile rename {content => public/ayerh.art}/index.html (97%) rename {js => public/ayerh.art/scripts}/waves.js (100%) rename {images => public/music.ayerh.art/images}/digital.jpg (100%) rename {images => public/music.ayerh.art/images}/vintage.jpg (100%) rename {images => public/music.ayerh.art/images}/vinyl.jpg (100%) rename {content/steve => public/steve.ayerh.art}/about/index.html (96%) rename {content/steve => public/steve.ayerh.art}/index.html (93%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2e1b094 --- /dev/null +++ b/Makefile @@ -0,0 +1,18 @@ +# most of my sites are super simple static html with some styles +# just compile the sass and copy content over +all: ayerh.art steve.ayerh.art music.ayerh.art + +ayerh.art: + @echo "Building ayerh.art" + @mkdir -p public/sites/ayerh.art/style + @sassc style/scss/waves.scss public/ayerh.art/style/waves.css + +steve.ayerh.art: + @echo "Building steve.ayerh.art" + @mkdir -p public/sites/steve.ayerh.art/style + @sassc style/scss/perspective.scss public/steve.ayerh.art/style/perspective.css + +music.ayerh.art: + @echo "Building music.ayerh.art" + @mkdir -p public/sites/music.ayerh.art/style + @sassc style/scss/music.scss public/steve.ayerh.art/style/music.css diff --git a/nginx/music.ayerh.art.conf b/nginx/music.ayerh.art.conf index 7f7c5d1..786f45c 100644 --- a/nginx/music.ayerh.art.conf +++ b/nginx/music.ayerh.art.conf @@ -2,7 +2,7 @@ server { server_name music.ayerh.art; listen 443; - root /home/steve/sites/music.ayerh.art; + root /home/steve/ayerh.art/public/music.ayerh.art; location ~ /.well-known { allow all; @@ -12,9 +12,9 @@ server { proxy_set_header Accept-Encoding ""; # TODO: handle params? - proxy_pass https://musicbrainz.org/ws/2/collection?editor=sayerhat + proxy_pass https://musicbrainz.org/ws/2/collection?editor=sayerhart - xslt_stylesheet /home/steve/sites/music.ayerh.art/xslt/collections.xsl; + xslt_stylesheet /home/steve/ayerh.art/xslt/collections.xsl; xslt_types *; } @@ -24,7 +24,7 @@ server { # TODO: handle params? proxy_pass https://musicbrainz.org/ws/2/collection/$uuid/releases?inc=artist-credits+releases; - xslt_stylesheet /home/steve/sites/music.ayerh.art/xslt/collection.xsl; + xslt_stylesheet /home/steve/ayerh.art/xslt/collection.xsl; xslt_types *; } diff --git a/content/index.html b/public/ayerh.art/index.html similarity index 97% rename from content/index.html rename to public/ayerh.art/index.html index dcba559..36e8841 100644 --- a/content/index.html +++ b/public/ayerh.art/index.html @@ -9,8 +9,8 @@ - - + + diff --git a/js/waves.js b/public/ayerh.art/scripts/waves.js similarity index 100% rename from js/waves.js rename to public/ayerh.art/scripts/waves.js diff --git a/images/digital.jpg b/public/music.ayerh.art/images/digital.jpg similarity index 100% rename from images/digital.jpg rename to public/music.ayerh.art/images/digital.jpg diff --git a/images/vintage.jpg b/public/music.ayerh.art/images/vintage.jpg similarity index 100% rename from images/vintage.jpg rename to public/music.ayerh.art/images/vintage.jpg diff --git a/images/vinyl.jpg b/public/music.ayerh.art/images/vinyl.jpg similarity index 100% rename from images/vinyl.jpg rename to public/music.ayerh.art/images/vinyl.jpg diff --git a/content/steve/about/index.html b/public/steve.ayerh.art/about/index.html similarity index 96% rename from content/steve/about/index.html rename to public/steve.ayerh.art/about/index.html index a8f89e5..54d12a5 100644 --- a/content/steve/about/index.html +++ b/public/steve.ayerh.art/about/index.html @@ -7,7 +7,7 @@ - + Steve Ayerhart diff --git a/content/steve/index.html b/public/steve.ayerh.art/index.html similarity index 93% rename from content/steve/index.html rename to public/steve.ayerh.art/index.html index c69b4b7..aa1519e 100644 --- a/content/steve/index.html +++ b/public/steve.ayerh.art/index.html @@ -7,7 +7,7 @@ - + Steve Ayerhart