forked from Archives/Athou_commafeed
added config element for context path (fix #611)
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
v 2.0.2
|
v 2.0.2
|
||||||
|
- context path is now configurable in config.yml (see app.contextPath in config.yml.example)
|
||||||
- fix login on firefox when fields are autofilled by the browser
|
- fix login on firefox when fields are autofilled by the browser
|
||||||
- user is now logged in after registration
|
- user is now logged in after registration
|
||||||
- fix link to documentation on home page and about page
|
- fix link to documentation on home page and about page
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
# CommaFeed settings
|
# CommaFeed settings
|
||||||
# ------------------
|
# ------------------
|
||||||
app:
|
app:
|
||||||
|
# context path of the application
|
||||||
|
contextPath: /
|
||||||
|
|
||||||
# url used to access commafeed
|
# url used to access commafeed
|
||||||
publicUrl: http://localhost:8082/
|
publicUrl: http://localhost:8082/
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
# CommaFeed settings
|
# CommaFeed settings
|
||||||
# ------------------
|
# ------------------
|
||||||
app:
|
app:
|
||||||
|
# context path of the application
|
||||||
|
contextPath: /
|
||||||
|
|
||||||
# url used to access commafeed
|
# url used to access commafeed
|
||||||
publicUrl: http://localhost:8082/
|
publicUrl: http://localhost:8082/
|
||||||
|
|
||||||
|
|||||||
@@ -130,6 +130,8 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run(CommaFeedConfiguration config, Environment environment) throws Exception {
|
public void run(CommaFeedConfiguration config, Environment environment) throws Exception {
|
||||||
|
environment.getApplicationContext().setContextPath(config.getApplicationSettings().getContextPath());
|
||||||
|
|
||||||
MetricRegistry metrics = environment.metrics();
|
MetricRegistry metrics = environment.metrics();
|
||||||
SessionFactory sessionFactory = hibernateBundle.getSessionFactory();
|
SessionFactory sessionFactory = hibernateBundle.getSessionFactory();
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,9 @@ public class CommaFeedConfiguration extends Configuration {
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public static class ApplicationSettings {
|
public static class ApplicationSettings {
|
||||||
|
@JsonProperty
|
||||||
|
private String contextPath;
|
||||||
|
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private String publicUrl;
|
private String publicUrl;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user