Change nginx syntax
This commit is contained in:
parent
f3292c019b
commit
194375452d
|
|
@ -28,7 +28,7 @@ class SiteConstruct
|
||||||
field :cert_ver_added_text
|
field :cert_ver_added_text
|
||||||
field :cert_ver_file_content
|
field :cert_ver_file_content
|
||||||
field :cert_ver_location_path
|
field :cert_ver_location_path
|
||||||
field :super_user_changed, type: Boolean, type: false
|
field :super_user_changed, type: Boolean, default: false
|
||||||
field :removed_super_users, type: Array, default: []
|
field :removed_super_users, type: Array, default: []
|
||||||
belongs_to :site_cert
|
belongs_to :site_cert
|
||||||
has_many :site_super_users, :autosave => true, :dependent => :destroy
|
has_many :site_super_users, :autosave => true, :dependent => :destroy
|
||||||
|
|
@ -100,7 +100,7 @@ class SiteConstruct
|
||||||
else
|
else
|
||||||
generate_server_block(port,server_blocks[0])
|
generate_server_block(port,server_blocks[0])
|
||||||
end
|
end
|
||||||
}.join("\n").gsub("\n", '\n')
|
}.join("\n")
|
||||||
end
|
end
|
||||||
def match_exact_index(text,match_character,level=1)
|
def match_exact_index(text,match_character,level=1)
|
||||||
text.enum_for(:scan,/(?:[^#{match_character}])#{match_character}{#{level}}(?!#{match_character})/m).map { offset_index=::Regexp.last_match.to_s.index(match_character);::Regexp.last_match.offset(0).first + offset_index}
|
text.enum_for(:scan,/(?:[^#{match_character}])#{match_character}{#{level}}(?!#{match_character})/m).map { offset_index=::Regexp.last_match.to_s.index(match_character);::Regexp.last_match.offset(0).first + offset_index}
|
||||||
|
|
@ -187,7 +187,7 @@ class SiteConstruct
|
||||||
if redirect_default_text.present?
|
if redirect_default_text.present?
|
||||||
new_server_block = new_server_block.sub(/\s*root/){|ff| redirect_default_text + ff}
|
new_server_block = new_server_block.sub(/\s*root/){|ff| redirect_default_text + ff}
|
||||||
end
|
end
|
||||||
new_server_block = new_server_block.gsub(/[\s]+\n/,"\n\n").gsub(/\n{3,}/,"\n\n").gsub("\n", '\n')
|
new_server_block = new_server_block.gsub(/[\s]+\n/,"\n\n").gsub(/\n{3,}/,"\n\n")
|
||||||
else
|
else
|
||||||
new_server_block = "server {\n"+
|
new_server_block = "server {\n"+
|
||||||
" listen #{port_text};\n\n"+
|
" listen #{port_text};\n\n"+
|
||||||
|
|
@ -212,7 +212,7 @@ class SiteConstruct
|
||||||
" proxy_pass http://#{self.get_site_name}_sock;\n"+
|
" proxy_pass http://#{self.get_site_name}_sock;\n"+
|
||||||
" }\n"+
|
" }\n"+
|
||||||
"}"
|
"}"
|
||||||
new_server_block.gsub("\n", '\n')
|
new_server_block
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
def display_port
|
def display_port
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue