diff --git a/.gitignore b/.gitignore index 6076d364..cb8562bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,6 @@ /config/database.yml /config/mnemosyne.yml /config/secrets.yml -/config/sendmail.yml -/config/smtp.yml /config/docker.yml*.erb /config/*.production.yml /config/*.staging.yml diff --git a/LOCAL_SETUP.md b/LOCAL_SETUP.md index e8c70163..37585191 100644 --- a/LOCAL_SETUP.md +++ b/LOCAL_SETUP.md @@ -138,7 +138,7 @@ admin@example.org:admin ``` - Get a local copy of the config files: ```shell script - for f in action_mailer.yml database.yml secrets.yml sendmail.yml smtp.yml code_ocean.yml docker.yml.erb mnemosyne.yml + for f in action_mailer.yml database.yml secrets.yml code_ocean.yml docker.yml.erb mnemosyne.yml do if [ ! -f config/$f ] then diff --git a/config/initializers/sendmail.rb b/config/initializers/sendmail.rb deleted file mode 100644 index cbb09a44..00000000 --- a/config/initializers/sendmail.rb +++ /dev/null @@ -1,3 +0,0 @@ -if CodeOcean::Application.config.action_mailer.delivery_method == :sendmail - CodeOcean::Application.config.action_mailer.sendmail_settings = CodeOcean::Config.new(:sendmail).read -end diff --git a/config/initializers/smtp.rb b/config/initializers/smtp.rb deleted file mode 100644 index 5db96f29..00000000 --- a/config/initializers/smtp.rb +++ /dev/null @@ -1,3 +0,0 @@ -if CodeOcean::Application.config.action_mailer.delivery_method == :smtp - CodeOcean::Application.config.action_mailer.sendmail_settings = CodeOcean::Config.new(:smtp).read -end diff --git a/config/sendmail.yml.example b/config/sendmail.yml.example deleted file mode 100644 index b14b144c..00000000 --- a/config/sendmail.yml.example +++ /dev/null @@ -1,11 +0,0 @@ -default: &default - arguments: CHANGE_ME - -development: - <<: *default - -production: - <<: *default - -test: - <<: *default diff --git a/config/smtp.yml.example b/config/smtp.yml.example deleted file mode 100644 index 1ef541ae..00000000 --- a/config/smtp.yml.example +++ /dev/null @@ -1,14 +0,0 @@ -default: &default - address: CHANGE_ME - password: CHANGE_ME - port: CHANGE_ME - user_name: CHANGE_ME - -development: - <<: *default - -production: - <<: *default - -test: - <<: *default