diff --git a/combine.lua b/combine.lua index afe63a7..9ee5453 100644 --- a/combine.lua +++ b/combine.lua @@ -32,7 +32,7 @@ if not magick then magick = "" end -local cmd = magick .. " convert -append " .. table.concat(origin, " ") .. " " .. combined +local cmd = magick .. " " .. convert .. " -append " .. table.concat(origin, " ") .. " " .. combined ngx.log(ngx.INFO, 'CMD -> ', cmd) local result, _, code = os.execute(cmd) if result and code == 0 then diff --git a/music-room-test.conf b/music-room-test.conf index 77bd95b..ca9ef67 100644 --- a/music-room-test.conf +++ b/music-room-test.conf @@ -53,6 +53,7 @@ server { #set $resty_loc "/usr/local/openresty"; set $resty_loc "/usr/local/opt/openresty"; # MacOS + set $convert "/usr/local/bin/convert"; location / { try_files $uri $uri/ /index.html;