Stop installing initializers/omniauth.rb in our rails package for the

API server. It has been a dangling symlink for a long time, and Rails
5.2 is no longer forgiving of that.

refs #16470

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/build/rails-package-scripts/README.md b/build/rails-package-scripts/README.md
index 0d720bde147d58cf26600ff784b7a34f92effaea..2930957b942affd86326248e6e0e4a3efb3166f9 100644 (file)
--- a/build/rails-package-scripts/README.md
+++ b/build/rails-package-scripts/README.md
@@ -12,7 +12,7 @@ Since our build process is a tower of shell scripts, concatenating files seemed
 
 postinst.sh lets the early parts define a few hooks to control behavior:
 
-* After it installs the core configuration files (database.yml, application.yml, and production.rb) to /etc/arvados/server, it calls setup_extra_conffiles.  By default this is a noop function (in step2.sh).  API server defines this to set up the old omniauth.rb conffile.
+* After it installs the core configuration files (database.yml, application.yml, and production.rb) to /etc/arvados/server, it calls setup_extra_conffiles.  By default this is a noop function (in step2.sh).
 * Before it restarts nginx, it calls setup_before_nginx_restart.  By default this is a noop function (in step2.sh).  API server defines this to set up the internal git repository, if necessary.
 * $RAILSPKG_DATABASE_LOAD_TASK defines the Rake task to load the database.  API server uses db:structure:load.  SSO server uses db:schema:load.  Workbench doesn't set this, which causes the postinst to skip all database work.
 * If $RAILSPKG_SUPPORTS_CONFIG_CHECK != 1, it won't run the config:check rake task.  SSO clears this flag (it doesn't have that task code).

diff --git a/build/rails-package-scripts/arvados-api-server.sh b/build/rails-package-scripts/arvados-api-server.sh
index 82bc9898aa87c350b38774db6db349294330bc9f..2504ff85daf94c2fde7091d227b7937c8eafcd6b 100644 (file)
--- a/build/rails-package-scripts/arvados-api-server.sh
+++ b/build/rails-package-scripts/arvados-api-server.sh
@@ -11,9 +11,6 @@ CONFIG_PATH=/etc/arvados/api
 DOC_URL="http://doc.arvados.org/install/install-api-server.html#configure"
 
 RAILSPKG_DATABASE_LOAD_TASK=db:structure:load
-setup_extra_conffiles() {
-    setup_conffile initializers/omniauth.rb
-}
 
 setup_before_nginx_restart() {
   # initialize git_internal_dir

diff --git a/build/rails-package-scripts/prerm.sh b/build/rails-package-scripts/prerm.sh
index 9816b14c6d5a975a1aafd51f7b47033196efd38c..6773b6f308080314fca9e6e4b7703567ab14a12a 100644 (file)
--- a/build/rails-package-scripts/prerm.sh
+++ b/build/rails-package-scripts/prerm.sh
@@ -10,7 +10,6 @@ remove () {
   rm -f $RELEASE_PATH/config/environments/production.rb
   rm -f $RELEASE_PATH/config/application.yml
   # Old API server configuration file.
-  rm -f $RELEASE_PATH/config/initializers/omniauth.rb
   rm -rf $RELEASE_PATH/public/assets/
   rm -rf $RELEASE_PATH/tmp
   rm -rf $RELEASE_PATH/.bundle

diff --git a/services/api/.gitignore b/services/api/.gitignore
index 793e981b505abb63cef5730b5f299afaf42564a6..0962779658358c95006435c8566f1c8d3c1e97fd 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -7,7 +7,6 @@
 
 # Sensitive files and local configuration
 /config/database.yml
-/config/initializers/omniauth.rb
 /config/application.yml
 
 # asset cache
@@ -35,4 +34,4 @@
 /package-build.version
 
 # Debugger history
-.byebug_history
\ No newline at end of file
+.byebug_history