Dealing with the following changes:

* mastodon/mastodon#14919
* mastodon/mastodon#12822

Author: frost-tb-voo

Dockerfile

@@ -7,18 +7,24 @@ LABEL org.label-schema.vcs-ref=$VCS_REF \
       org.label-schema.vcs-url="https://github.com/frost-tb-voo/mastodon-http-local"
 
 RUN sed -i -e "s|force_ssl|# force_ssl|g" /opt/mastodon/app/controllers/application_controller.rb
+RUN sed -i -e "s|Rails.env.production?|false|g" /opt/mastodon/app/controllers/application_controller.rb
+RUN cat /opt/mastodon/app/controllers/application_controller.rb
 
 RUN sed -i -e 's|"https://#{record.domain}"|"http://#{record.domain}"|g' /opt/mastodon/app/helpers/admin/action_logs_helper.rb
 RUN sed -i -e "s|https://#{attributes['domain']}|http://#{attributes['domain']}|g" /opt/mastodon/app/helpers/admin/action_logs_helper.rb
+RUN cat /opt/mastodon/app/helpers/admin/action_logs_helper.rb
 
-RUN sed -i -e "s|https =|https = false # https =|g" /opt/mastodon/config/initializers/1_hosts.rb
-RUN sed -i -e "s|http#{Rails.configuration.x.use_https ? 's' : ''}|http|g" /opt/mastodon/config/initializers/content_security_policy.rb
+RUN sed -i -e 's|https://#{@domain}|http://#{@domain}|g' /opt/mastodon/app/lib/webfinger.rb
+RUN cat /opt/mastodon/app/lib/webfinger.rb
 
 RUN sed -i -e "s|https://#{domain}|http://#{domain}|g" /opt/mastodon/lib/mastodon/domains_cli.rb
+RUN cat /opt/mastodon/lib/mastodon/domains_cli.rb
 
-RUN sed -i -e "s|'https'|'http'|g" /opt/mastodon/vendor/bundle/ruby/2.6.0/gems/goldfinger-2.1.1/lib/goldfinger/client.rb
+RUN sed -i -e "s|https =|https = false # https =|g" /opt/mastodon/config/initializers/1_hosts.rb
+RUN cat /opt/mastodon/config/initializers/1_hosts.rb
 
-RUN sed -i -e "s|Rails.env.production?|false|g" /opt/mastodon/app/controllers/application_controller.rb
+RUN sed -i -e "s|http#{Rails.configuration.x.use_https ? 's' : ''}|http|g" /opt/mastodon/config/initializers/content_security_policy.rb
+RUN cat /opt/mastodon/config/initializers/content_security_policy.rb
 
 RUN sed -i -e 's/Rails.env.production? || /false \&\& /g' /opt/mastodon/config/initializers/devise.rb
 RUN sed -i -e 's/Rails.env.production? || /false \&\& /g' /opt/mastodon/config/initializers/session_store.rb

script/grepRb.sh

@@ -6,30 +6,43 @@ M_HOME=/opt/mastodon
 APP=${M_HOME}/app
 CONFIG=${M_HOME}/config
 LIB=${M_HOME}/lib
-GFINGER=${M_HOME}/vendor/bundle/ruby/2.6.0/gems/goldfinger-2.1.1
-OSTATUS=${M_HOME}/vendor/bundle/ruby/2.6.0/gems/ostatus2-2.0.3
-
-mkdir -p temp
-# echo "find ${M_HOME} -type f -name "*.rb" -print | xargs grep -rn 'https'" >> temp/find.sh
-# echo "find ${APP} -type f -name "*.rb" -print | xargs grep -rn 'https'" >> temp/find.sh
-# echo "find ${CONFIG} -type f -name "*.rb" -print | xargs grep -rn 'https'" >> temp/find.sh
-# echo "find ${LIB} -type f -name "*.rb" -print | xargs grep -rn 'https'" >> temp/find.sh
-echo "find ${APP} -type f -print | xargs grep -rn 'https'" >> temp/find.sh
-echo "find ${CONFIG} -type f -print | xargs grep -rn 'https'" >> temp/find.sh
-echo "find ${LIB} -type f -print | xargs grep -rn 'https'" >> temp/find.sh
-
-echo "find ${GFINGER} -type f -name "*.rb" -print | xargs grep -rn 'https'" >> temp/find.sh
-echo "find ${OSTATUS} -type f -name "*.rb" -print | xargs grep -rn 'https'" >> temp/find.sh
-
-echo "find ${APP} -type f -name "*.rb" -print | xargs grep -rn 'LOCAL_HTTPS'" >> temp/find.sh
-echo "find ${CONFIG} -type f -name "*.rb" -print | xargs grep -rn 'LOCAL_HTTPS'" >> temp/find.sh
-echo "find ${LIB} -type f -name "*.rb" -print | xargs grep -rn 'LOCAL_HTTPS'" >> temp/find.sh
+# GFINGER=${M_HOME}/vendor/bundle/ruby/2.6.0/gems/goldfinger-2.1.1
+# OSTATUS=${M_HOME}/vendor/bundle/ruby/2.6.0/gems/ostatus2-2.0.3
+
+# echo "ls ${M_HOME}/vendor/bundle/ruby/2.6.0/gems/" >> temp/find.sh
+
+mkdir -p tmp
+echo "rm -f /tmp/log" >> tmp/find.sh
+echo "echo 'GREP for https +*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+'" >> tmp/find.sh
+echo "find ${M_HOME} \
+      -type d -name 'vendor' -prune -or \
+      -type d -name 'spec' -prune -or \
+      -type f -name '*.rb' -print \
+      | xargs grep 'https' >> /tmp/log" >> tmp/find.sh
+echo "cat /tmp/log | \
+      grep -v 'http https' | \
+      grep -v 'https?' | \
+      grep -v \"'http://', 'https://'\" | \
+      grep -v -P 'https://[a-z]+.*'" >> tmp/find.sh
+
+echo "rm -f /tmp/log" >> tmp/find.sh
+echo "echo 'GREP for LOCAL_HTTPS +*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+'" >> tmp/find.sh
+echo "find ${M_HOME} \
+      -type d -name 'vendor' -prune -or \
+      -type d -name 'spec' -prune -or \
+      -type f -name '*.rb' -print \
+      | xargs grep 'LOCAL_HTTPS' >> /tmp/log" >> tmp/find.sh
+echo "cat /tmp/log | \
+      grep -v 'http https' | \
+      grep -v 'https?' | \
+      grep -v \"'http://', 'https://'\" | \
+      grep -v -P 'https://[a-z]+.*'" >> tmp/find.sh
 
 docker pull tootsuite/mastodon
 docker run --rm -it \
- -v `pwd`/temp:/temp:rw \
+ -v `pwd`/tmp:/temp:rw \
  tootsuite/mastodon \
  bash /temp/find.sh
 
-rm -r temp
+rm -r tmp