diff --git a/lib/make.rb b/lib/make.rb index b8330b1..1609f01 100644 --- a/lib/make.rb +++ b/lib/make.rb @@ -7,7 +7,6 @@ require 'fileutils' require 'open3' # make for: the user, system, package -# user/usr, system/sys, package/pkg # as regular user, if dependencies provided # user: $HOME/.local diff --git a/lib/user.rb b/lib/user.rb deleted file mode 100644 index 0e36e36..0000000 --- a/lib/user.rb +++ /dev/null @@ -1,5 +0,0 @@ - -module User - - -end \ No newline at end of file diff --git a/recipes/example-roda.rb b/recipes/example-roda.rb deleted file mode 100644 index d721902..0000000 --- a/recipes/example-roda.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'nginx' - -class ExampleProxy < NGINXProxy - domain "gurgul.org" - service "forgejo" - user "git" - port 3000 -end - -puts ExampleProxy.generate -puts ExampleProxy.available_path diff --git a/lib/data/templates/nginx/default.erb b/recipes/nginx/default.erb similarity index 100% rename from lib/data/templates/nginx/default.erb rename to recipes/nginx/default.erb diff --git a/lib/nginx.rb b/recipes/nginx/generate.rb similarity index 71% rename from lib/nginx.rb rename to recipes/nginx/generate.rb index 731af57..cb9f0cc 100644 --- a/lib/nginx.rb +++ b/recipes/nginx/generate.rb @@ -3,12 +3,7 @@ require 'erb' class NGINXProxy class << self - attr_accessor :domain, :port, :service, :user, :willcard - - def willcard(value = nil) - @willcard = value unless value.nil? - @willcard - end + attr_accessor :domain, :port, :service, :user def domain(value = nil) @domain = value unless value.nil? @@ -32,11 +27,8 @@ class NGINXProxy @service end - ## bundle exec rackup -s puma -b unix:///run/user/1000/http.sock - def generate - template_path = File.join(__dir__, 'data', 'templates', 'nginx', 'proxy.erb') - template = File.read(template_path) + template = File.read("proxy.erb") template = ERB.new(template) template.result(binding) end @@ -56,3 +48,12 @@ class NGINXProxy end end +class ExampleProxy < NGINXProxy + domain "gurgul.org" + service "forgejo" + user "git" + port 3000 +end + +puts ExampleProxy.generate +puts ExampleProxy.path diff --git a/lib/data/templates/nginx/proxy.erb b/recipes/nginx/proxy.erb similarity index 100% rename from lib/data/templates/nginx/proxy.erb rename to recipes/nginx/proxy.erb