From aa2b17fc70e2282c09220227be69429a47ed9c84 Mon Sep 17 00:00:00 2001 From: "G. Gibson" Date: Sun, 28 Apr 2024 14:10:40 -0700 Subject: [PATCH] Explicit install dep => webrick --- Services/core.rb | 4 ++-- install.rb | 1 + seeds/gxg-service-testing | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Services/core.rb b/Services/core.rb index 5ebfdf0..bb4f8fb 100755 --- a/Services/core.rb +++ b/Services/core.rb @@ -1505,7 +1505,7 @@ module GxG # if existing_permissions.is_a?(::Array) existing_permissions.each do |entry| - ::GxG::SERVICES[:core][:resources].set_permissions(the_path.to_s, entry[:credential] entry[:permissions]) + ::GxG::SERVICES[:core][:resources].set_permissions(the_path.to_s, entry[:credential], entry[:permissions]) end end # @@ -1587,7 +1587,7 @@ module GxG end # def version() - ::BigDecimal(@manifest[:version]) + ::BigDecimal.new(@manifest[:version]) end # def version=(the_version=nil) diff --git a/install.rb b/install.rb index 1daa6fd..3f38afd 100755 --- a/install.rb +++ b/install.rb @@ -17,6 +17,7 @@ if RUBY_ENGINE == "jruby" requirements.push({:requirement => "psych", :gem => "psych"}) requirements.push({:requirement => "sinatra", :gem => "sinatra"}) requirements.push({:requirement => "sinatra-contrib", :gem => "sinatra-contrib"}) + requirements.push({:requirement => "webrick", :gem => "webrick"}) requirements.push({:requirement => "webrocket", :gem => "webrocket"}) # Installation requirements.each do |the_record| diff --git a/seeds/gxg-service-testing b/seeds/gxg-service-testing index fa6dc7b..0d14615 100644 --- a/seeds/gxg-service-testing +++ b/seeds/gxg-service-testing @@ -8,15 +8,18 @@ Type=simple User=root WorkingDirectory=/srv/gxg-server - #ExecStart=/srv/gxg-server/daemon start #ExecStop=/srv/gxg-server/daemon stop #ExecStart=/usr/bin/sudo -u www-data /usr/bin/env jruby /srv/gxg-server/Services/core.rb -ExecStart=/usr/bin/sudo -u mistergibson /usr/bin/env jruby /srv/gxg-server/Services/core.rb +#ExecStart=/usr/bin/sudo -u mistergibson /usr/bin/env jruby /srv/gxg-server/Services/core.rb +ExecStart=/usr/bin/sudo -u mistergibson /srv/gxg-server/daemon start + +PIDFile=/srv/gxg-server/System/Temporary/server.pid + +ExecStop=/usr/bin/sudo -u mistergibson /srv/gxg-server/daemon stop PIDFile=/srv/gxg-server/System/Temporary/server.pid -ExecStop=/srv/gxg-server/daemon stop Restart=always