Merge pull request '記事を追加' (#34) from add-2023-09-03-yamashita-park into master

Reviewed-on: #34

.drone.yml

@@ -23,7 +23,7 @@ steps:
     - git submodule update --init --recursive
 
   - name: hugo
-    image: cibuilds/hugo:0.106
+    image: cibuilds/hugo:0.115.4
     commands:
       - sudo hugo -e production --minify -v -s .
 
@@ -35,7 +35,7 @@ steps:
   - name: housekeep
     image: appleboy/drone-ssh
     settings:
-      host: 10.0.1.166
+      host: 10.0.1.222
       username: webadm
       port: 10022
       key:
@@ -47,7 +47,7 @@ steps:
   - name: scp
     image: appleboy/drone-scp
     settings:
-      host: 10.0.1.166
+      host: 10.0.1.222
       username: webadm
       port: 10022
       target:
@@ -81,7 +81,7 @@ steps:
     - git submodule update --init --recursive
 
   - name: hugo
-    image: cibuilds/hugo:0.106
+    image: cibuilds/hugo:0.115.4
     commands:
       - sudo hugo -e staging --minify -v -s  .
 
@@ -93,7 +93,7 @@ steps:
   - name: housekeep
     image: appleboy/drone-ssh
     settings:
-      host: 10.0.1.166
+      host: 10.0.1.222
       username: webadm
       port: 10022
       key:
@@ -104,7 +104,7 @@ steps:
   - name: scp
     image: appleboy/drone-scp
     settings:
-      host: 10.0.1.166
+      host: 10.0.1.222
       username: webadm
       port: 10022
       target: /var/www/test

config/_default/config.toml

@@ -3,6 +3,7 @@ baseURL = "https://blog.kazu634.com/"
 defaultContentLanguage = "en"
 # language code
 languageCode = "jp"
+hasCJKLanguage = true
 title = "His greatness lies in his sense of responsibilities"
 
 # Change the default theme to be use when building the site with Hugo

config/staging/config.toml

@@ -3,6 +3,7 @@ baseURL = "https://test.kazu634.com/"
 defaultContentLanguage = "en"
 # language code
 languageCode = "jp"
+hasCJKLanguage = true
 title = "His greatness lies in his sense of responsibilities"
 
 # Change the default theme to be use when building the site with Hugo

content/photos/2023/2023-01-01-shiogama.md

@@ -0,0 +1,15 @@
++++
+title = "鹽竈神社"
+date = 2023-01-01T12:11:00+09:00
+lastmod = 2023-01-01T12:11:00+09:00
+description = "鹽竈神社です"
+tags = ["塩竈"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Sony a6400"
+lens = "E 35mm F1.8 G"
+location = "鹽竈神社"
+images = ["ogp/2023-01-01-shiogama.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/52601995381/in/datetaken-public/" title="Untitled"><img src="https://live.staticflickr.com/65535/52601995381_83eab08e1f_b.jpg" width="683" height="1024" alt="Untitled"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-01-28-kamata-tires.md

@@ -0,0 +1,15 @@
++++
+title = "タイヤ公園"
+date = 2023-01-28T12:11:00+09:00
+lastmod = 2023-01-28T12:11:00+09:00
+description = "蒲田のタイヤ公園"
+tags = ["蒲田"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Ricoh GR IIIx"
+lens = "26.0 mm"
+location = "西六郷公園"
+images = ["ogp/2023-01-28-kamata-tires.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/52653985314/in/datetaken-public/" title="R0000151.JPG"><img src="https://live.staticflickr.com/65535/52653985314_b323d64b8f_b.jpg" width="1024" height="683" alt="R0000151.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-03-06-yushima-monkey.md

@@ -0,0 +1,15 @@
++++
+title = "お猿さん"
+date = 2023-03-06T12:11:00+09:00
+lastmod = 2023-03-06T12:11:00+09:00
+description = "湯島天神で見かけた猿回し"
+tags = ["湯島"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Sony a6400"
+lens = "E 50mm F1.8 G"
+location = "湯島天神"
+images = ["ogp/2023-03-06-yushima-monkey.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/52729632141/in/datetaken-public/" title="DSC02362.JPG"><img src="https://live.staticflickr.com/65535/52729632141_4e89413600_b.jpg" width="1024" height="683" alt="DSC02362.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-04-01-katsuoji.md

@@ -0,0 +1,15 @@
++++
+title = "だるまさんの寺"
+date = 2023-04-01T12:11:00+09:00
+lastmod = 2023-04-01T12:11:00+09:00
+description = "だるまさんがたくさんいるお寺です"
+tags = ["大阪"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Ricoh GR IIIx"
+lens = "26.0 mm"
+location = "勝尾寺"
+images = ["ogp/2023-04-01-katsuoji.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/52787287236/in/datetaken-public/" title="R0000504.JPG"><img src="https://live.staticflickr.com/65535/52787287236_b59a1f257c_b.jpg" width="1024" height="683" alt="R0000504.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-06-10-okachimachi.md

@@ -0,0 +1,15 @@
++++
+title = "パンダ"
+date = 2023-06-10T12:11:00+09:00
+lastmod = 2023-06-10T12:11:00+09:00
+description = "御徒町駅のパンダ"
+tags = ["御徒町"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Sony a7c"
+lens = "FE 55mm F1.8 ZA"
+location = "御徒町駅"
+images = ["ogp/2023-06-10-okachimachi.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/52966215748/in/datetaken-public/" title="DSC02461.JPG"><img src="https://live.staticflickr.com/65535/52966215748_45c6306bde_b.jpg" width="1024" height="683" alt="DSC02461.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-07-01-mishima-shrine.md

@@ -0,0 +1,15 @@
++++
+title = "巫女さん"
+date = 2023-07-01T12:11:00+09:00
+lastmod = 2023-07-01T12:11:00+09:00
+description = "三嶋大社で歩いている巫女さん"
+tags = ["三島"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Sony a7c"
+lens = "DG DN Contemporary 022"
+location = "三嶋大社"
+images = ["ogp/2023-07-01-mishima-shrine.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/53017052303/in/datetaken-public/" title="DSC02707.JPG"><img src="https://live.staticflickr.com/65535/53017052303_40250c3c38_b.jpg" width="1024" height="683" alt="DSC02707.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-08-14-onagawa.md

@@ -0,0 +1,15 @@
++++
+title = "女川のこどもたち"
+date = 2023-08-14T12:11:00+09:00
+lastmod = 2023-08-14T12:11:00+09:00
+description = "女川港のところにあったこどもたちの像"
+tags = ["女川"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Ricoh GR IIIx"
+lens = "26.0 mm"
+location = "女川港"
+images = ["ogp/2023-08-14-onagawa.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/53124244706/in/datetaken-public/" title="R0000711.JPG"><img src="https://live.staticflickr.com/65535/53124244706_7fc209bc7a_b.jpg" width="683" height="1024" alt="R0000711.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

content/photos/2023/2023-09-03-yamashita-park.md

@@ -0,0 +1,14 @@
++++
+title = "海と雲"
+date = 2023-09-03T12:11:00+09:00
+description = "山下公園から見た海と空の様子"
+tags = ["横浜"]
+categories = ["写真"]
+author = "kazu634"
+camera = "Sony a7c"
+lens = "16-28mm F2.8 DG DN | Contemporary"
+location = "山下公園"
+images = ["ogp/2023-09-03-yamashita-park.webp"]
++++
+
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/42332031@N02/53160573198/in/datetaken/" title="DSC03144.JPG"><img src="https://live.staticflickr.com/65535/53160573198_6efb5af94e_b.jpg" width="1024" height="683" alt="DSC03144.JPG"/></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>

tasks/production.rake

@@ -10,8 +10,8 @@ task :prod => [:init, :prep, :tcard] do
 
   sh 'find public/ -type f | egrep "\.(css|js|png|jpg|html|JPG|PNG|CSS|JS|HTML)$" | xargs -n 1 -i% -P 0 sh -c "cp % %.bk && gzip % && mv %.bk %"'
 
-  sh 'ssh -p 10022 webadm@10.0.1.166 "rm -rf /var/www/blog/*"'
-  sh 'ssh -p 10022 webadm@10.0.1.166 "rm -rf /home/webadm/works/public/*"'
-  sh 'rsync -e "ssh -p 10022" -rltvz --omit-dir-times --delete public/ webadm@10.0.1.166:/var/www/blog'
-  sh 'rsync -e "ssh -p 10022" -rltvz --omit-dir-times --delete public/ webadm@10.0.1.166:/home/webadm/works/public'
+  sh 'ssh -p 10022 webadm@10.0.1.222 "rm -rf /var/www/blog/*"'
+  sh 'ssh -p 10022 webadm@10.0.1.222 "rm -rf /home/webadm/works/public/*"'
+  sh 'rsync -e "ssh -p 10022" -rltvz --omit-dir-times --delete public/ webadm@10.0.1.222:/var/www/blog'
+  sh 'rsync -e "ssh -p 10022" -rltvz --omit-dir-times --delete public/ webadm@10.0.1.222:/home/webadm/works/public'
 end

tasks/staging.rake

@@ -11,5 +11,5 @@ task :stag => [:init, :prep, :tcard] do
   sh 'find public/ -type f | egrep "\.(css|js|png|jpg|html|JPG|PNG|CSS|JS|HTML)$" | xargs -n 1 -i% -P 0 sh -c "cp % %.bk && gzip % && mv %.bk %"'
 
   sh 'ssh -p 10022 webadm@10.0.1.166 "rm -rf /var/www/test/*"'
-  sh 'rsync -e "ssh -p 10022" -rltvz --omit-dir-times --delete public/ webadm@10.0.1.166:/var/www/test'
+  sh 'rsync -e "ssh -p 10022" -rltvz --omit-dir-times --delete public/ webadm@10.0.1.222:/var/www/test'
 end

themes/DoIt

@@ -1 +1 @@
-Subproject commit ed33294d759d1428bacface8b17fdcedae3e64b8
+Subproject commit 08986cef8182b2e3e8dcdde8cd61ae6768b75444