Commit Graph

581 Commits

Author SHA1 Message Date
Kazuhiro MUSASHI 6abf67e828 Specify the environment by hugo option:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ jobs:
       - run:
           name: "Run Hugo"
           working_directory: /root/project/
-          command: HUGO_ENV=staging hugo -v -s /root/project/
+          command: hugo -e staging -v -s /root/project/

       - run:
           name: Change Amazon Links
```
2019-05-04 21:55:31 +08:00
Kazuhiro MUSASHI 5ec3b74ae9 Change base url based on the environment:
```
--- a/layouts/partials/sections-definition.html
+++ b/layouts/partials/sections-definition.html
@@ -1,3 +1,3 @@
-          <li><a href="https://blog.kazu634.com/labs/">Labs</a></li>
-          <li><a href="https://blog.kazu634.com/quotes/">Quotes</a></li>
-          <li><a href="https://blog.kazu634.com/travel/">Travel</a></li>
+          <li><a href="{{ .Site.BaseURL }}/labs/">Labs</a></li>
+          <li><a href="{{ .Site.BaseURL }}/quotes/">Quotes</a></li>
+          <li><a href="{{ .Site.BaseURL }}/travel/">Travel</a></li>
```
2019-05-04 21:42:30 +08:00
Kazuhiro MUSASHI d24089860d Workaround for "failed to set permissions":
See: [rsync問題集 \- Qiita](https://qiita.com/xiaopihang/items/4e1cfed2a497f82d6bed)

```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,4 +47,4 @@ jobs:
           name: Deploy
           command: |
             ssh -p ${SSHPORT} ${USER_NAME}@${HOST_NAME} "rm -rf /var/www/test/*"
-            rsync -e "ssh -p ${SSHPORT}" --omit-dir-times -avz --delete public/ ${USER_NAME}@${HOST_NAME}:/var/www/test
+            rsync -e "ssh -p ${SSHPORT}" --omit-dir-times -rltvz --delete public/ ${USER_NAME}@${HOST_NAME}:/var/www/test
```
2019-05-04 21:37:20 +08:00
Kazuhiro MUSASHI 2395971119 Workaround for "failed to set times" error:
See [UNIX/rsync/ディレクトリの修正時間でパーミッションエラーが起きる \-
yanor\.net/wiki](http://yanor.net/wiki/?UNIX/rsync/%E3%83%87%E3%82%A3%E3%83%AC%E3%82%AF%E3%83%88%E3%83%AA%E3%81%AE%E4%BF%AE%E6%AD%A3%E6%99%82%E9%96%93%E3%81%A7%E3%83%91%E3%83%BC%E3%83%9F%E3%83%83%E3%82%B7%E3%83%A7%E3%83%B3%E3%82%A8%E3%83%A9%E3%83%BC%E3%81%8C%E8%B5%B7%E3%81%8D%E3%82%8B):

```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,4 +47,4 @@ jobs:
           name: Deploy
           command: |
             ssh -p ${SSHPORT} ${USER_NAME}@${HOST_NAME} "rm -rf /var/www/test/*"
-            rsync -e "ssh -p ${SSHPORT}" -az --delete public/ ${USER_NAME}@${HOST_NAME}:/var/www/test
+            rsync -e "ssh -p ${SSHPORT}" --omit-dir-times -avz --delete public/ ${USER_NAME}@${HOST_NAME}:/var/www/test
```
2019-05-04 21:32:52 +08:00
Kazuhiro MUSASHI 0c6f2c8368 Specify the environment when generating site:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ jobs:
       - run:
           name: "Run Hugo"
           working_directory: /root/project/
-          command: HUGO_ENV=production hugo -v -s /root/project/
+          command: HUGO_ENV=staging hugo -v -s /root/project/

       - run:
           name: Change Amazon Links
@@ -47,4 +47,4 @@ jobs:
           name: Deploy
           command: |
             ssh -p ${SSHPORT} ${USER_NAME}@${HOST_NAME} "rm -rf /var/www/test/*"
-            rsync -e "ssh -p ${SSHPORT}" -az --delete public ${USER_NAME}@${HOST_NAME}:/var/www/test
+            rsync -e "ssh -p ${SSHPORT}" -az --delete public/ ${USER_NAME}@${HOST_NAME}:/var/www/test
```
2019-05-04 21:30:35 +08:00
Kazuhiro MUSASHI 685e10db5c Add config file for staging. 2019-05-04 21:30:18 +08:00
Kazuhiro MUSASHI c67daed5be Deploy
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,14 +6,6 @@ jobs:

     steps:
       - checkout
-      - add_ssh_keys:
-          fingerprints:
-            - "7d:eb:56:da:3f:71:e1:fd:2f:c1:86:18:fe:08:8b:f9"
-      - run:
-          name: Start ssh-keyscan
-          command: |
-            ssh-keyscan -p ${SSHPORT} ${HOST_NAME} >> ~/.ssh/known_hosts
-
       - run:
           name: Change Amazon Links
           working_directory: /root/project/
@@ -42,3 +34,17 @@ jobs:
             do
               gzip -c ${TARGET} > ${TARGET}.gz
             done
+
+      - add_ssh_keys:
+          fingerprints:
+            - "7d:eb:56:da:3f:71:e1:fd:2f:c1:86:18:fe:08:8b:f9"
+      - run:
+          name: Start ssh-keyscan
+          command: |
+            ssh-keyscan -p ${SSHPORT} ${HOST_NAME} >> ~/.ssh/known_hosts
+
+      - run:
+          name: Deploy
+          command: |
+            ssh -p i${SSHPORT} ${USER_NAME}@${HOST_NAME} "rm -rf /var/www/test/*"
+            rsync -e "ssh -p ${SSHPORT}" -az --delete public ${USER_NAME}@${HOST_NAME}:/var/www/test
```
2019-05-04 21:15:31 +08:00
Kazuhiro MUSASHI 51ea68b3e3 Specify SSH port number:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ jobs:
       - run:
           name: Start ssh-keyscan
           command: |
-            ssh-keyscan ${HOST_NAME} >> ~/.ssh/known_hosts
+            ssh-keyscan -p ${SSHPORT} ${HOST_NAME} >> ~/.ssh/known_hosts

       - run:
           name: Change Amazon Links
```
2019-05-04 21:01:46 +08:00
Kazuhiro MUSASHI 46353b48e8 Use `egrep` instead of `find -regex`:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,7 +38,7 @@ jobs:
           name: "Gzip css/js/images"
           working_directory: /root/project/
           command: |
-            for TARGET in `find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"`
+            for TARGET in `find public/ -type f | egrep "\.(css|js|png|jpg|JPG|PNG|CSS|JS)$"`
             do
               gzip -c ${TARGET} > ${TARGET}.gz
             done
```
2019-05-04 20:57:38 +08:00
Kazuhiro MUSASHI 7caefb9317 Delete unnecessary line:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,7 +38,6 @@ jobs:
           name: "Gzip css/js/images"
           working_directory: /root/project/
           command: |
-            TARGETS=`find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"
             for TARGET in `find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"`
             do
               gzip -c ${TARGET} > ${TARGET}.gz
```
2019-05-04 20:53:45 +08:00
Kazuhiro MUSASHI c121f7db02 Specify `set +o pipefail`:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,7 @@ jobs:
           name: Change Amazon Links
           working_directory: /root/project/
           command: |
+            set +o pipefail
             grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g"
             grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g"

@@ -30,6 +31,7 @@ jobs:
           name: Change Amazon Links
           working_directory: /root/project/
           command: |
+            set +o pipefail
             grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g"

       - run:
```
2019-05-04 20:51:41 +08:00
Kazuhiro MUSASHI 4f6f71f2f8 Add `working_directory`:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,21 +16,25 @@ jobs:

       - run:
           name: Change Amazon Links
+          working_directory: /root/project/
           command: |
             grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g"
             grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g"

       - run:
           name: "Run Hugo"
+          working_directory: /root/project/
           command: HUGO_ENV=production hugo -v -s /root/project/

       - run:
           name: Change Amazon Links
+          working_directory: /root/project/
           command: |
             grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g"

       - run:
           name: "Gzip css/js/images"
+          working_directory: /root/project/
           command: |
             TARGETS=`find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"
             for TARGET in `find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"`
```
2019-05-04 20:43:24 +08:00
Kazuhiro MUSASHI eaef25c364 Building the blog site:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,8 +6,34 @@ jobs:

     steps:
       - checkout
+      - add_ssh_keys:
+          fingerprints:
+            - "7d:eb:56:da:3f:71:e1:fd:2f:c1:86:18:fe:08:8b:f9"
+      - run:
+          name: Start ssh-keyscan
+          command: |
+            ssh-keyscan ${HOST_NAME} >> ~/.ssh/known_hosts
+
+      - run:
+          name: Change Amazon Links
+          command: |
+            grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g"
+            grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g"
+
       - run:
           name: "Run Hugo"
           command: HUGO_ENV=production hugo -v -s /root/project/
-      - store_artifacts:
-          path: /root/project/public
+
+      - run:
+          name: Change Amazon Links
+          command: |
+            grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g"
+
+      - run:
+          name: "Gzip css/js/images"
+          command: |
+            TARGETS=`find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"
+            for TARGET in `find ./public/ -type f -regextype posix-egrep -regex ".*\.(css|js|png|jpg|JPG|PNG|CSS|JS)"`
+            do
+              gzip -c ${TARGET} > ${TARGET}.gz
+            done
```
2019-05-04 20:40:10 +08:00
Kazuhiro MUSASHI dfd6e53df4 Change the path-to-public directory:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,4 +10,4 @@ jobs:
           name: "Run Hugo"
           command: HUGO_ENV=production hugo -v -s /root/project/
       - store_artifacts:
-          path: /tmp/artifacts
+          path: /root/project/public
```
2019-05-04 19:07:42 +08:00
Kazuhiro MUSASHI 9673dfe93e Use artifacts to see the results:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,3 +9,5 @@ jobs:
       - run:
           name: "Run Hugo"
           command: HUGO_ENV=production hugo -v -s /root/project/
+      - store_artifacts:
+          path: /tmp/artifacts
```
2019-05-04 19:06:21 +08:00
Kazuhiro MUSASHI a348722bea Delete `Test Website`:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,3 @@ jobs:
       - run:
           name: "Run Hugo"
           command: HUGO_ENV=production hugo -v -s /root/project/
-      - run:
-          name: "Test Website"
-          command: htmlproofer /root/project/public --allow-hash-href --check-html --empty-alt-ignore --disable-external
-
```
2019-05-04 19:01:44 +08:00
Kazuhiro MUSASHI 3273955767 Change the path-to-public-directory:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,5 +11,5 @@ jobs:
           command: HUGO_ENV=production hugo -v -s /root/project/
       - run:
           name: "Test Website"
-          command: htmlproofer src/public --allow-hash-href --check-html --empty-alt-ignore --disable-external
+          command: htmlproofer /root/project/public --allow-hash-href --check-html --empty-alt-ignore --disable-external
```
2019-05-04 18:59:31 +08:00
Kazuhiro MUSASHI c52c1d60d8 Change the path-to-checkout directory:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
       - checkout
       - run:
           name: "Run Hugo"
-          command: HUGO_ENV=production hugo -v -s src/
+          command: HUGO_ENV=production hugo -v -s /root/project/
       - run:
           name: "Test Website"
           command: htmlproofer src/public --allow-hash-href --check-html --empty-alt-ignore --disable-external
```
2019-05-04 18:57:02 +08:00
Kazuhiro MUSASHI 4307a8de8a Use `cibuilds/hugo:latest`:
```
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,16 +2,14 @@ version: 2
 jobs:
   build:
     docker:
-      - image: debian:stretch
+      - image: cibuilds/hugo:latest

     steps:
       - checkout
-
       - run:
-          name: Greeting
-          command: echo Hello, world.
-
+          name: "Run Hugo"
+          command: HUGO_ENV=production hugo -v -s src/
       - run:
-          name: Print the Current Time
-          command: date
+          name: "Test Website"
+          command: htmlproofer src/public --allow-hash-href --check-html --empty-alt-ignore --disable-external
```
2019-05-04 18:49:31 +08:00
Kazuhiro MUSASHI 003a943a1d Add sample `config.yml`:
```
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,16 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: debian:stretch
+
+    steps:
+      - checkout
+
+      - run:
+        name: Greeting
+        command: echo Hello, world.
+
+      - run:
+        name: Print the Current Time
+        command: date
```
2019-05-04 18:38:50 +08:00
Kazuhiro MUSASHI f2b27b4750 [WIP] Support for `Circle CI`.
This is to support `Circle CI`.
2019-05-04 18:24:03 +08:00
Kazuhiro MUSASHI 569e0cfc1a
Merge pull request #25 from kazu634/leaflet-mapbox-js-support
Add `004-display-raster-style-data-leaflet.md`.
2019-05-04 14:35:30 +07:00
Kazuhiro MUSASHI 86e9badb27 Add `004-display-raster-style-data-leaflet.md`. 2019-05-04 15:33:06 +08:00
Kazuhiro MUSASHI 713d0787b9
Merge pull request #24 from kazu634/leaflet-mapbox-js-support
Leaflet mapbox js support
2019-05-01 21:28:17 +07:00
Kazuhiro MUSASHI 0eaa663acb Modify the category name of `003-setup-dev-environment.md`:
```
--- a/content/labs/leaflet-js-mapbox-js/003-setup-dev-environment.md
+++ b/content/labs/leaflet-js-mapbox-js/003-setup-dev-environment.md
@@ -2,7 +2,7 @@
 title = "JavaScriptではじめるWebマップアプリケーション: Chapter2-2"
 date = 2019-05-01T21:07:08+07:00
 Description = "JavaScriptではじめるWebマップアプリケーションの内容を淡々と試してみます。"
-Categories = ["Leaflet.js"]
+Categories = ["Mapbox GL JS"]
 +++

 『[JavaScriptではじめるWebマップアプリケーション \(PDF版\)](https://booth.pm/ja/items/1314906)』の内容を淡々と試してみます。`Mapbox GL JS`で地図を表示してみます:
```
2019-05-01 22:24:34 +08:00
Kazuhiro MUSASHI f2da3f266f Add an article about development environment for Mapbox GL js. 2019-05-01 22:19:48 +08:00
Kazuhiro MUSASHI 96490c26d9 Add an article about development environment for Leaflet.js. 2019-05-01 22:18:38 +08:00
Kazuhiro MUSASHI f9bcf1af88 Rename the directory name from `leaflet-js` to `leaflet-mapbox-js`. 2019-05-01 19:09:13 +08:00
Kazuhiro MUSASHI ade41c13d3 [WIP] This is to study `Leaflet.js` & `Mapbox GL JS`.
This is to study `Leaflet.js` and `Mapbox GL JS`.
2019-05-01 19:04:17 +08:00
Kazuhiro MUSASHI d825b76cdd
Merge pull request #23 from kazu634/modify-date-string-of-sleeper-train-article
Modify the date string:
2019-05-01 15:31:59 +07:00
Kazuhiro MUSASHI 90eadb0342 Modify the date string:
```
--- a/content/travel/2019/2019-05-01-sleeper-train-in-thailand.md
+++ b/content/travel/2019/2019-05-01-sleeper-train-in-thailand.md
@@ -1,6 +1,6 @@
 +++
 title = "バンコクからチェンマイへの寝台列車の旅"
-date = 2019-05-01:16:49+08:00
+date = 2019-05-01T12:49:49+08:00
 Description = "バンコクからチェンマイへ寝台列車に乗って旅してきました"
 Tags = ["Bangkok", "Chiang Mai"]
 Categories = ["旅行"]
```
2019-05-01 16:30:41 +08:00
Kazuhiro MUSASHI bf5fce5ede
Merge pull request #22 from kazu634/add-artcile-on-sleeper-train-in-thailand
Modify the article location & date string
2019-05-01 15:22:01 +07:00
Kazuhiro MUSASHI ce38675b13 Modify the Date string:
```
--- a/content/travel/2019/2019-05-01-sleeper-train-in-thailand.md
+++ b/content/travel/2019/2019-05-01-sleeper-train-in-thailand.md
@@ -1,6 +1,6 @@
 +++
 title = "バンコクからチェンマイへの寝台列車の旅"
-date = 2018-04-20T19:03:49+08:00
+date = 2019-05-01:16:49+08:00
 Description = "バンコクからチェンマイへ寝台列車に乗って旅してきました"
 Tags = ["Bangkok", "Chiang Mai"]
 Categories = ["旅行"]
```
2019-05-01 16:20:29 +08:00
Kazuhiro MUSASHI 2bcaa6b4ec Modify the article location. 2019-05-01 16:19:43 +08:00
Kazuhiro MUSASHI 16ced6dc4d
Merge pull request #21 from kazu634/add-artcile-on-sleeper-train-in-thailand
Add artcile on sleeper train in thailand
2019-05-01 15:15:35 +07:00
Kazuhiro MUSASHI c4a433b180 Add the overview of the train trip from Bangkok to Chiang Mai 2019-05-01 15:12:45 +07:00
Kazuhiro MUSASHI 4c1b8a5680 Delete the unnecessary H1 2019-05-01 15:06:25 +07:00
Kazuhiro MUSASHI 356f3d96a2 Add the contents 2019-05-01 15:00:15 +07:00
Kazuhiro MUSASHI 90c8868072
Merge pull request #20 from kazu634/huen-muai-jai-in-chiang-mai
Huen Muai Jai in chiang mai
2019-04-21 21:28:00 +07:00
Kazuhiro MUSASHI fcdcbea13d Add map link to the article. 2019-04-21 22:26:08 +08:00
Kazuhiro MUSASHI 0840ddaaa1 Add images to the article. 2019-04-21 22:20:17 +08:00
Kazuhiro MUSASHI e067f8fb3e initial draft 2019-04-21 21:05:24 +07:00
Kazuhiro MUSASHI b3adc85aaa Create an article template:
```
--- /dev/null
+++ b/content/post/2019/04/21/2019-04-21-huen-muai-jai-in-chiang-mai.md
@@ -0,0 +1,11 @@
++++
+title = "2019 04 21 Huen Muai Jai in Chiang Mai"
+date = 2019-04-21T17:38:34+08:00
+Description = ""
+Tags = []
+Categories = []
+image=""
++++
+
+<div class="mermaid">
+</div>
```
2019-04-21 17:41:34 +08:00
Kazuhiro MUSASHI cd21b98d0b [WIP] Add article about Huen muai Jai in Chiang Mai.
This is to add an article about Huen Muai Jai in Chiang Mai.
2019-04-21 17:40:22 +08:00
Kazuhiro MUSASHI 2cabdca8e2
Merge pull request #19 from kazu634/Add-quote-article-on-Seikei-Izumo-no-Logistics
Add quote article on seikei izumo no logistics
2019-04-20 22:44:14 +07:00
Kazuhiro MUSASHI 71a7e0e3df Add link to Amazon. 2019-04-20 23:42:31 +08:00
Kazuhiro MUSASHI bf537e9cb8 Pointing to the HTTPs image file. 2019-04-20 23:42:06 +08:00
Kazuhiro MUSASHI 089c2cbf8f
Merge pull request #18 from kazu634/Add-quote-article-on-Seikei-Izumo-no-Logistics
Add amazon link.
2019-04-20 22:38:24 +07:00
Kazuhiro MUSASHI 5134f417fd Add amazon link. 2019-04-20 23:36:46 +08:00
Kazuhiro MUSASHI 7cba556f77 Add outline 2019-04-20 14:07:34 +07:00