Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/webapp/themes/basic/weblog.vm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; font-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
#showAnalyticsTrackingCode($model.weblog)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/themes/basicmobile/weblog.vm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; font-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
#showAnalyticsTrackingCode($model.weblog)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/themes/fauxcoly/weblog.vm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; font-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
#includeTemplate($model.weblog "standard_head")
<title>$model.weblog.name: $model.weblog.tagline</title>
#showAutodiscoveryLinks($model.weblog)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/themes/frontpage/_header.vm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; font-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<title>$model.weblog.name</title>
<link href="$url.absoluteSite/favicon.svg" rel="shortcut icon" type="image/x-icon" />
#showAutodiscoveryLinks($model.weblog)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/themes/gaurav/std_head.vm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *; font-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'">
#if ($model.permalink == false)
<meta name="Description" content="$model.weblog.about">
#else
Expand Down
13 changes: 13 additions & 0 deletions docs/roller-install-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,19 @@ be packaged as ojdbc14.jar, even if operating on Oracle 9 server.
* See the server specific sections to information on where to place the
JDBC driver jars.

=== H2 database considerations

H2 is not one of Roller's officially supported databases (PostgreSQL, MySQL and
Derby are), but Roller can run against it as a generic JDBC database. If you use
H2 2.5.250 or later, be aware that H2 now treats VALUE as a reserved word.
Several Roller tables, such as ROLLER_PROPERTIES, have a column named VALUE, so
Roller will fail to read them on newer H2. To work around this, append
;NON_KEYWORDS=VALUE to your H2 JDBC connection URL, for example:

----
jdbc:h2:file:/path/to/rollerdb;NON_KEYWORDS=VALUE
----

== Deploy Roller to Tomcat

Deploying Roller to the Tomcat servlet container involves creating a
Expand Down
Loading