Skip to content

Commit decf552

Browse files
J0WIvmassol
authored andcommitted
Update urls to use https (#16)
1 parent 691c39f commit decf552

File tree

17 files changed

+29
-29
lines changed

17 files changed

+29
-29
lines changed

10/mysql-tomcat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN apt-get update && \
4545
# Create the Tomcat temporary directory
4646
# Configure the XWiki permanent directory
4747
ENV XWIKI_VERSION=10.11.7
48-
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
48+
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
4949
ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5
5050
RUN rm -rf /usr/local/tomcat/webapps/* && \
5151
mkdir -p /usr/local/tomcat/temp && \

10/mysql-tomcat/tomcat/setenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# We're making the following changes to the default:
2323
# * Adding more memory (default is 512MB which is not enough for XWiki)
2424
# * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
25-
# http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
25+
# https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
2626
# be able to have '/' and '' in wiki page names.
2727
# * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
2828

10/mysql-tomcat/xwiki/hibernate.cfg.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<session-factory>
2828

2929
<!-- Please refer to the installation guide on
30-
http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
30+
https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
3131
database. You'll need to do 2 things:
3232
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
3333
2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
4343
<property name="jdbc.use_scrollable_resultset">false</property>
4444

4545
<!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
46-
at http://commons.apache.org/proper/commons-dbcp/configuration.html
46+
at https://commons.apache.org/proper/commons-dbcp/configuration.html
4747
-->
4848
<property name="dbcp.defaultAutoCommit">false</property>
4949
<property name="dbcp.maxTotal">50</property>

10/postgres-tomcat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN apt-get update && \
4545
# Create the Tomcat temporary directory
4646
# Configure the XWiki permanent directory
4747
ENV XWIKI_VERSION=10.11.7
48-
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
48+
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
4949
ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5
5050
RUN rm -rf /usr/local/tomcat/webapps/* && \
5151
mkdir -p /usr/local/tomcat/temp && \

10/postgres-tomcat/tomcat/setenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# We're making the following changes to the default:
2323
# * Adding more memory (default is 512MB which is not enough for XWiki)
2424
# * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
25-
# http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
25+
# https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
2626
# be able to have '/' and '' in wiki page names.
2727
# * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
2828

10/postgres-tomcat/xwiki/hibernate.cfg.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<session-factory>
2828

2929
<!-- Please refer to the installation guide on
30-
http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
30+
https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
3131
database. You'll need to do 2 things:
3232
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
3333
2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
4343
<property name="jdbc.use_scrollable_resultset">false</property>
4444

4545
<!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
46-
at http://commons.apache.org/proper/commons-dbcp/configuration.html
46+
at https://commons.apache.org/proper/commons-dbcp/configuration.html
4747
-->
4848
<property name="dbcp.defaultAutoCommit">false</property>
4949
<property name="dbcp.maxTotal">50</property>

11/mysql-tomcat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN apt-get update && \
4545
# Create the Tomcat temporary directory
4646
# Configure the XWiki permanent directory
4747
ENV XWIKI_VERSION=11.2
48-
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
48+
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
4949
ENV XWIKI_DOWNLOAD_SHA256 8dcdbc3ea28d8929f881c83544409faafbe4e0f462322e6386b6d2ff53f12bfa
5050
RUN rm -rf /usr/local/tomcat/webapps/* && \
5151
mkdir -p /usr/local/tomcat/temp && \

11/mysql-tomcat/tomcat/setenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# We're making the following changes to the default:
2323
# * Adding more memory (default is 512MB which is not enough for XWiki)
2424
# * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
25-
# http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
25+
# https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
2626
# be able to have '/' and '' in wiki page names.
2727
# * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
2828

11/mysql-tomcat/xwiki/hibernate.cfg.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<session-factory>
2828

2929
<!-- Please refer to the installation guide on
30-
http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
30+
https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
3131
database. You'll need to do 2 things:
3232
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
3333
2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
4343
<property name="jdbc.use_scrollable_resultset">false</property>
4444

4545
<!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
46-
at http://commons.apache.org/proper/commons-dbcp/configuration.html
46+
at https://commons.apache.org/proper/commons-dbcp/configuration.html
4747
-->
4848
<property name="dbcp.defaultAutoCommit">false</property>
4949
<property name="dbcp.maxTotal">50</property>

11/postgres-tomcat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN apt-get update && \
4545
# Create the Tomcat temporary directory
4646
# Configure the XWiki permanent directory
4747
ENV XWIKI_VERSION=11.2
48-
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
48+
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
4949
ENV XWIKI_DOWNLOAD_SHA256 8dcdbc3ea28d8929f881c83544409faafbe4e0f462322e6386b6d2ff53f12bfa
5050
RUN rm -rf /usr/local/tomcat/webapps/* && \
5151
mkdir -p /usr/local/tomcat/temp && \

11/postgres-tomcat/tomcat/setenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# We're making the following changes to the default:
2323
# * Adding more memory (default is 512MB which is not enough for XWiki)
2424
# * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
25-
# http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
25+
# https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
2626
# be able to have '/' and '' in wiki page names.
2727
# * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
2828

11/postgres-tomcat/xwiki/hibernate.cfg.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<session-factory>
2828

2929
<!-- Please refer to the installation guide on
30-
http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
30+
https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
3131
database. You'll need to do 2 things:
3232
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
3333
2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
4343
<property name="jdbc.use_scrollable_resultset">false</property>
4444

4545
<!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
46-
at http://commons.apache.org/proper/commons-dbcp/configuration.html
46+
at https://commons.apache.org/proper/commons-dbcp/configuration.html
4747
-->
4848
<property name="dbcp.defaultAutoCommit">false</property>
4949
<property name="dbcp.maxTotal">50</property>

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# What is XWiki
22

3-
[XWiki](http://xwiki.org) is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management.
3+
[XWiki](https://xwiki.org/) is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management.
44

55
As an application wiki, XWiki allows for the storing of structured data and the execution of server side script within the wiki interface. Scripting languages including Velocity, Groovy, Python, Ruby and PHP can be written directly into wiki pages using wiki macros. User-created data structures can be defined in wiki documents and instances of those structures can be attached to wiki documents, stored in a database, and queried using either Hibernate query language or XWiki's own query language.
66

7-
[XWiki.org's extension wiki](http://extensions.xwiki.org) is home to XWiki extensions ranging from [code snippets](http://snippets.xwiki.org) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it.
7+
[XWiki.org's extension wiki](https://extensions.xwiki.org/) is home to XWiki extensions ranging from [code snippets](https://snippets.xwiki.org/) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it.
88

9-
![logo](http://www.xwiki.org/xwiki/bin/view/Main/Logo?xpage=plain&act=svg&finput=logo-xwikiorange.svg&foutput=logo-xwikiorange.png&width=200)
9+
![logo](https://www.xwiki.org/xwiki/bin/view/Main/Logo?xpage=plain&act=svg&finput=logo-xwikiorange.svg&foutput=logo-xwikiorange.png&width=200)
1010

1111
# Table of contents
1212

@@ -359,7 +359,7 @@ secrets:
359359

360360
## Using an external Solr service
361361

362-
From the [XWiki Solr Search API documentation](http://extensions.xwiki.org/xwiki/bin/view/Extension/Solr%20Search%20API):
362+
From the [XWiki Solr Search API documentation](https://extensions.xwiki.org/xwiki/bin/view/Extension/Solr%20Search%20API):
363363

364364
> By default XWiki ships with an embedded Solr. This is mostly for ease of use but the embedded instance is not really recommended by the Solr team so you might want to externalize it when starting to have a wiki with a lots of pages. Solr is using a lot of memory and a standalone Solr instance is generally better in term of speed than the embedded one. It should not be much noticeable in a small wiki but if you find yourself starting to have memory issues and slow search results you should probably try to install and setup an external instance of Solr using the guide.
365365
>
@@ -378,7 +378,7 @@ solr.remote.url=http://$INDEX_HOST:$INDEX_PORT/solr/xwiki
378378

379379
The simplest way to create an external Solr service is using the [official Solr image](https://hub.docker.com/_/solr/).
380380

381-
- Select the appropriate XWiki Solr configuration JAR from [here](http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/) (Note: it's usually better to synchronize it with your version of XWiki)
381+
- Select the appropriate XWiki Solr configuration JAR from [here](https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/) (Note: it's usually better to synchronize it with your version of XWiki)
382382
- Place this JAR in a directory along side `solr-init.sh` that you can fetch from the [docker-xwiki repository](https://github.com/xwiki-contrib/docker-xwiki/tree/master/contrib/solr)
383383
- Ensure that this directory is owned by the Solr user and group `chown -R 8983:8983 /path/to/solr/init/directory`
384384
- Launch the Solr container and mount this directory at `/docker-entrypoint-initdb.d`
@@ -574,8 +574,8 @@ The Dockerfile repository is also licensed under the [LGPL 2.1](https://github.c
574574

575575
# Support
576576

577-
- If you wish to raise an issue or an idea of improvement use [XWiki Docker JIRA project](http://jira.xwiki.org/browse/XDOCKER)
578-
- If you have questions, use the [XWiki Users Mailing List/Forum](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or use the [XWiki IRC channel](http://dev.xwiki.org/xwiki/bin/view/Community/IRC)
577+
- If you wish to raise an issue or an idea of improvement use [XWiki Docker JIRA project](https://jira.xwiki.org/browse/XDOCKER)
578+
- If you have questions, use the [XWiki Users Mailing List/Forum](https://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or use the [XWiki IRC channel](https://dev.xwiki.org/xwiki/bin/view/Community/IRC)
579579

580580
# Contribute
581581

contrib/solr/solr-init.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Usage:
44
# - Place the XWiki Solr configuration jar into the same directory as this script
5-
# - ex. wget http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/10.1/xwiki-platform-search-solr-server-data-10.1.jar
5+
# - ex. wget https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-search-solr-server-data/10.1/xwiki-platform-search-solr-server-data-10.1.jar
66
# - ensure that this directory, and it's contents, are owned by the solr user and group, 8983:8983
77
# - ex. chown -R 8983:8983 $PARENT_DIRECTORY
88
# - mount the partent directory of this script to /docker-entrypoint-initdb.d/ when you run the Solr container
@@ -36,4 +36,4 @@ unzip -o $jar \
3636
core='xwiki/*'
3737
unzip -o $jar \
3838
$core \
39-
-d $location
39+
-d $location

template/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN apt-get update && \\
4646
# Create the Tomcat temporary directory
4747
# Configure the XWiki permanent directory
4848
ENV XWIKI_VERSION=$xwikiVersion
49-
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/\${XWIKI_VERSION}"
49+
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/\${XWIKI_VERSION}"
5050
ENV XWIKI_DOWNLOAD_SHA256 $xwikiSha256
5151
RUN rm -rf /usr/local/tomcat/webapps/* && \\
5252
mkdir -p /usr/local/tomcat/temp && \\

template/tomcat/setenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# We're making the following changes to the default:
2323
# * Adding more memory (default is 512MB which is not enough for XWiki)
2424
# * By default, Tomcat does not allow the usage of encoded slash '%2F' and backslash '%5C' in URLs, as noted in
25-
# http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
25+
# https://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10. We want to allow for them as it's useful to
2626
# be able to have '/' and '\' in wiki page names.
2727
# * On some system /dev/random is slow to init leading to a slow Tomcat and thus Xwiki startup.
2828

template/xwiki/hibernate.cfg.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<session-factory>
2828

2929
<!-- Please refer to the installation guide on
30-
http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
30+
https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
3131
database. You'll need to do 2 things:
3232
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
3333
2) Uncomment the properties below for your specific DB (and comment the default
@@ -43,7 +43,7 @@
4343
<property name="jdbc.use_scrollable_resultset">false</property>
4444

4545
<!-- DBCP Connection Pooling configuration. Only some properties are shown. All available properties can be found
46-
at http://commons.apache.org/proper/commons-dbcp/configuration.html
46+
at https://commons.apache.org/proper/commons-dbcp/configuration.html
4747
-->
4848
<property name="dbcp.defaultAutoCommit">false</property>
4949
<property name="dbcp.maxTotal">50</property>

0 commit comments

Comments
 (0)