From 390574ed456bb3bfdf29312940ba5552a5940ffe Mon Sep 17 00:00:00 2001 From: ZiRo Date: Mon, 28 Mar 2016 15:34:38 +0200 Subject: [PATCH 1/4] initial installer --- contrib/templates/default/inst_db.mustache | 53 ++++++++++++++++++++++ contrib/translations/en-US.ini | 12 ++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 contrib/templates/default/inst_db.mustache diff --git a/contrib/templates/default/inst_db.mustache b/contrib/templates/default/inst_db.mustache new file mode 100644 index 0000000..d5c8546 --- /dev/null +++ b/contrib/templates/default/inst_db.mustache @@ -0,0 +1,53 @@ + + + + + + + + {{#i18n.Translations}}{{db_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{db_install_title}}{{/i18n.Translations}}
+
+
+
+ + + + + + + + + + + +
+ + + {{#i18n.Translations}}{{postgres_name}}{{/i18n.Translations}} +
+ + + {{#i18n.Translations}}{{redis_name}}{{/i18n.Translations}} +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/translations/en-US.ini b/contrib/translations/en-US.ini index 20b77be..5b53f3a 100644 --- a/contrib/translations/en-US.ini +++ b/contrib/translations/en-US.ini @@ -118,4 +118,14 @@ overboard_title=ukko / overboard posted_on_label=Posted on #404 page -resource_not_found=The page you are looking for isn't here \ No newline at end of file +resource_not_found=The page you are looking for isn't here + +#installer +db_install_title=Choose a database +redis_name=Redis +postgres_name=PostgreSQL + +next_prompt=Next > +previous_prompt=< Previous +finish_prompt=Finish! + From 44ff1d2fb62fff4a809c8b1a45ad2ed6424691f6 Mon Sep 17 00:00:00 2001 From: ZiRo Date: Tue, 29 Mar 2016 13:38:38 +0200 Subject: [PATCH 2/4] Add database installer --- contrib/templates/default/inst_db.mustache | 3 + .../default/inst_postgres_db.mustache | 72 +++++++++++++++++++ .../templates/default/inst_redis_db.mustache | 64 +++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 contrib/templates/default/inst_postgres_db.mustache create mode 100644 contrib/templates/default/inst_redis_db.mustache diff --git a/contrib/templates/default/inst_db.mustache b/contrib/templates/default/inst_db.mustache index d5c8546..550a89f 100644 --- a/contrib/templates/default/inst_db.mustache +++ b/contrib/templates/default/inst_db.mustache @@ -9,6 +9,9 @@
{{#i18n.Translations}}{{db_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}}
diff --git a/contrib/templates/default/inst_postgres_db.mustache b/contrib/templates/default/inst_postgres_db.mustache new file mode 100644 index 0000000..4fdc4d8 --- /dev/null +++ b/contrib/templates/default/inst_postgres_db.mustache @@ -0,0 +1,72 @@ + + + + + + + + {{#i18n.Translations}}{{postgres_db_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{postgres_db_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} + +
+
+ + + + + + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{host_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{port_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{username_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{password_name}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+ + {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_redis_db.mustache b/contrib/templates/default/inst_redis_db.mustache new file mode 100644 index 0000000..67ed6c2 --- /dev/null +++ b/contrib/templates/default/inst_redis_db.mustache @@ -0,0 +1,64 @@ + + + + + + + + {{#i18n.Translations}}{{redis_db_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{redis_db_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{host_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{port_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{password_name}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + From 323f2f150c143d294c48a65b67fc48f7a9e3b910 Mon Sep 17 00:00:00 2001 From: ZiRo Date: Tue, 29 Mar 2016 15:58:28 +0200 Subject: [PATCH 3/4] Some more installer dialogs --- contrib/templates/default/inst_bins.mustache | 64 +++++++++++++++ contrib/templates/default/inst_cache.mustache | 64 +++++++++++++++ .../templates/default/inst_crypto.mustache | 56 +++++++++++++ contrib/templates/default/inst_nntp.mustache | 80 +++++++++++++++++++ .../default/inst_redis_cache.mustache | 64 +++++++++++++++ 5 files changed, 328 insertions(+) create mode 100644 contrib/templates/default/inst_bins.mustache create mode 100644 contrib/templates/default/inst_cache.mustache create mode 100644 contrib/templates/default/inst_crypto.mustache create mode 100644 contrib/templates/default/inst_nntp.mustache create mode 100644 contrib/templates/default/inst_redis_cache.mustache diff --git a/contrib/templates/default/inst_bins.mustache b/contrib/templates/default/inst_bins.mustache new file mode 100644 index 0000000..278238e --- /dev/null +++ b/contrib/templates/default/inst_bins.mustache @@ -0,0 +1,64 @@ + + + + + + + + {{#i18n.Translations}}{{binary_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{binary_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{convert_prompt}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{ffmpeg_prompt}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{sox_prompt}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_cache.mustache b/contrib/templates/default/inst_cache.mustache new file mode 100644 index 0000000..ee6c363 --- /dev/null +++ b/contrib/templates/default/inst_cache.mustache @@ -0,0 +1,64 @@ + + + + + + + + {{#i18n.Translations}}{{cache_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{cache_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + +
+ + + {{#i18n.Translations}}{{file_cache_name}}{{/i18n.Translations}} +
+ + + {{#i18n.Translations}}{{null_cache_name}}{{/i18n.Translations}} +
+ + + {{#i18n.Translations}}{{redis_cache_name}}{{/i18n.Translations}} +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_crypto.mustache b/contrib/templates/default/inst_crypto.mustache new file mode 100644 index 0000000..4567736 --- /dev/null +++ b/contrib/templates/default/inst_crypto.mustache @@ -0,0 +1,56 @@ + + + + + + + + {{#i18n.Translations}}{{crypto_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{crypto_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + +
+ {{#i18n.Translations}}{{host_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{key_name}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_nntp.mustache b/contrib/templates/default/inst_nntp.mustache new file mode 100644 index 0000000..a6a6af6 --- /dev/null +++ b/contrib/templates/default/inst_nntp.mustache @@ -0,0 +1,80 @@ + + + + + + + + {{#i18n.Translations}}{{nntp_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{nntp_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{nntp_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{allow_attachments_prompt}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{allow_anon_prompt}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{allow_anon_attachments_prompt}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{require_tls_prompt}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_redis_cache.mustache b/contrib/templates/default/inst_redis_cache.mustache new file mode 100644 index 0000000..67ed6c2 --- /dev/null +++ b/contrib/templates/default/inst_redis_cache.mustache @@ -0,0 +1,64 @@ + + + + + + + + {{#i18n.Translations}}{{redis_db_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{redis_db_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{host_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{port_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{password_name}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + From 177082fded6fdb22181c7d68d5b85a68492b28fe Mon Sep 17 00:00:00 2001 From: ZiRo Date: Tue, 29 Mar 2016 18:48:37 +0200 Subject: [PATCH 4/4] Even more installer dialogs --- contrib/templates/default/inst_api.mustache | 64 +++++++++++++++++ .../templates/default/inst_frontend.mustache | 72 +++++++++++++++++++ contrib/templates/default/inst_key.mustache | 56 +++++++++++++++ contrib/translations/en-US.ini | 44 +++++++++++- 4 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 contrib/templates/default/inst_api.mustache create mode 100644 contrib/templates/default/inst_frontend.mustache create mode 100644 contrib/templates/default/inst_key.mustache diff --git a/contrib/templates/default/inst_api.mustache b/contrib/templates/default/inst_api.mustache new file mode 100644 index 0000000..908d104 --- /dev/null +++ b/contrib/templates/default/inst_api.mustache @@ -0,0 +1,64 @@ + + + + + + + + {{#i18n.Translations}}{{api_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{api_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{api_username}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{api_password_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{api_secret_name}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_frontend.mustache b/contrib/templates/default/inst_frontend.mustache new file mode 100644 index 0000000..7535dfe --- /dev/null +++ b/contrib/templates/default/inst_frontend.mustache @@ -0,0 +1,72 @@ + + + + + + + + {{#i18n.Translations}}{{frontend_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{frontend_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + + + + + + + + + +
+ {{#i18n.Translations}}{{frontend_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{locale_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{allow_files_prompt}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{enable_json_prompt}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/templates/default/inst_key.mustache b/contrib/templates/default/inst_key.mustache new file mode 100644 index 0000000..5f932ea --- /dev/null +++ b/contrib/templates/default/inst_key.mustache @@ -0,0 +1,56 @@ + + + + + + + + {{#i18n.Translations}}{{key_install_title}}{{/i18n.Translations}} + + +
{{#i18n.Translations}}{{key_install_title}}{{/i18n.Translations}}
+ {{#dialog.HasError}} +

{{dialog.Error}}

+ {{/dialog.HasError}} +
+
+
+ + + + + + + + + + + +
+ {{#i18n.Translations}}{{pubkey_name}}{{/i18n.Translations}} + + +
+ {{#i18n.Translations}}{{secretkey_name}}{{/i18n.Translations}} + + +
+
+ {{#dialog.HasNext}} + + {{/dialog.HasNext}} + {{^dialog.HasNext}} + + {{/dialog.HasNext}} +
+
+ {{#dialog.HasPrevious}} +
+
+ + +
+
+ {{/dialog.HasPrevious}} + + diff --git a/contrib/translations/en-US.ini b/contrib/translations/en-US.ini index 5b53f3a..eae395c 100644 --- a/contrib/translations/en-US.ini +++ b/contrib/translations/en-US.ini @@ -120,7 +120,7 @@ posted_on_label=Posted on #404 page resource_not_found=The page you are looking for isn't here -#installer +#'installer db_install_title=Choose a database redis_name=Redis postgres_name=PostgreSQL @@ -129,3 +129,45 @@ next_prompt=Next > previous_prompt=< Previous finish_prompt=Finish! +redis_db_install_title=Please enter the connection details for Redis +postgres_db_install_title=Please enter the connection details for PostgreSQL +crypto_install_title=TLS settings +host_name=Hostname or IP address +key_name=TLS keyname +port_name=Port number +username_name=Username +password_name=Password + +nntp_install_title=Configure the NNTP settings +nntp_name=Name of the NNTP instance +allow_attachments_prompt=Allow attachments +allow_anon_prompt=Allow anonymous posters +allow_anon_attachments_prompt=Allow attachments from anonymous posters +require_tls_prompt=Require TLS for incoming connections + +binary_install_title=Configure the path of the external programs +convert_prompt=convert path +ffmpeg_prompt=ffmpeg path +sox_prompt=sox path + +cache_install_title=Please choose the mechanism by which the HTML pages are cached +null_cache_name=None +file_cache_name=Static files +redis_cache_name=Redis + +frontend_install_title=Frontend settings +frontend_name=Name +locale_name=Locale +allow_files_prompt=Allow file uploads +enable_json_prompt=Enable the JSON API + +api_install_title=API settings +api_username=API username +api_password_name=API password +api_secret_name=API secret + +pubkey_name=Public key +secretkey_name=Secret key +key_install_title=A new keypair has been generated for you. Please keep it safe and don't share it with anyone, as this is used to login to the mod panel +#' +