Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Martin Lensment 2014-08-07 14:29:57 +03:00
commit d2b94895b1
4 changed files with 20 additions and 11 deletions

1
.gitignore vendored
View file

@ -10,6 +10,7 @@ capybara-*.html
**.orig
config/initializers/secret_token.rb
config/secrets.yml
config/database.yml
## Environment normalisation:
/.bundle

View file

@ -1,7 +1,7 @@
Domain Registry
===============
Full stack registry system desingned for a top-level domain (TLD) management.
Full stack top-level domain (TLD) management.
Installation
@ -16,12 +16,13 @@ Usual Rails 4 app installation, rvm and bundler are your friends.
cd registry
rvm install ruby-2.1.2
bundle
rake db:setup
### Apache with patched mod_epp (Debian 7/Ubuntu 14.04 LTS)
sudo apt-get install apache2
sudo apt-get install apache2-threaded-dev # needed to compile mod_epp
sudo apt-get install apache2-threaded-dev # needed to compile mod_epp
wget sourceforge.net/projects/aepps/files/mod_epp/1.10/mod_epp-1.10.tar.gz
tar -xzvf mod_epp-1.10.tar.gz
cd mod_epp-1.10
@ -31,7 +32,7 @@ formatted content boundaries, the mod_epp needs to be modified before building:
wget https://github.com/internetee/registry/raw/master/doc/patches/mod_epp_1.10-rack-friendly.patch
patch < mod_epp_1.10-rack-friendly.patch
apxs2 -a -c -i mod_epp.c
sudo apxs2 -a -c -i mod_epp.c
Enable ssl:

View file

@ -1,24 +1,28 @@
mod_epp.c | 2 +-
mod_epp.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mod_epp.c b/mod_epp.c
index 60c0004..bf2b6ab 100644
index 8b1ba6f..66e46d8 100644
--- a/mod_epp.c
+++ b/mod_epp.c
@@ -756,7 +756,7 @@ sprintf(content_length, "%lu", strlen(EPP_CONTENT_FRAME_CGI)
strlen(conf->raw_frame)
+ er->orig_xml_size) : 0));
strlen(conf->raw_frame)
+ er->orig_xml_size) : 0));
-apr_table_set(r->headers_in, "Content-Type", "multipart/form-data; boundary=--BOUNDARY--");
+apr_table_set(r->headers_in, "Content-Type", EPP_CONTENT_TYPE_CGI);
apr_table_set(r->headers_in, "Content-Length", content_length);
apr_table_set(r->headers_in, "Cookie", er->ur->cookie);
diff --git a/mod_epp.h b/mod_epp.h
index d8c463e..7f6e320 100644
index e72d980..5e99bad 100644
--- a/mod_epp.h
+++ b/mod_epp.h
@@ -96,10 +96,10 @@ module AP_MODULE_DECLARE_DATA epp_module;
#define EPP_DEFAULT_RC_HEADER "X-EPP-Returncode"
-#define EPP_CONTENT_TYPE_CGI "multipart/form-data; boundary=--BOUNDARY--"
-#define EPP_CONTENT_FRAME_CGI "----BOUNDARY--\r\nContent-Disposition: form-data; name=\"frame\"\r\n\r\n"
-#define EPP_CONTENT_RAW_CGI "\r\n----BOUNDARY--\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n"
@ -28,3 +32,6 @@ index d8c463e..7f6e320 100644
+#define EPP_CONTENT_RAW_CGI "\r\n----BOUNDARY\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n"
+#define EPP_CONTENT_CLTRID_CGI "\r\n----BOUNDARY\r\nContent-Disposition: form-data; name=\"clTRID\"\r\n\r\n"
#define EPP_CONTENT_POSTFIX_CGI "\r\n----BOUNDARY--\r\n"
/*