Changeset 32432 for main/trunk/greenstone3/build.xml
- Timestamp:
- 2018-09-07T19:39:40+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r32429 r32432 258 258 But 'localhost' (or actually, 127.0.0.1) needed for solr: solr servlet not accessible to outside world 259 259 --> 260 <property name="local.http.url" value="http://127.0.0.1:${localhost.port.http}"/> 260 <condition property="local.http.url" value="http://${localhost.server.http}" else="http://${localhost.server.http}:${localhost.port.http}"> 261 <equals arg1="${localhost.port.http}" arg2="80" trim="true"/> 262 </condition> 261 263 262 264 <!-- On linux, if testing https certification, pass in minus-minus-staging. If not testing on linux, nothing extra to pass in. … … 1038 1040 </target> 1039 1041 1042 <!-- returns the base local URL, something like HTTP://127.0.0.1:<HTTPport> 1043 or some sane equivalent for 127.0.0.1 --> 1044 <target name="get-local-base-http-url"> 1045 <echo>${local.http.url}</echo> 1046 </target> 1047 <!-- Returns something like HTTP://127.0.0.1:<HTTPport>/greenstone3/library --> 1048 <target name="get-local-http-servlet-url"> 1049 <echo>${local.http.url}${app.path}${server.default.servlet}</echo> 1050 </target> 1051 1040 1052 <!-- solr should only be accessible locally, which therefore also means only over http. 1041 But for http, use 127.0.0.1 instead of localhost (as localhost can be mapped to something other than 127.0.0.11042 and is therefore not safe). Seehttps://letsencrypt.org/docs/certificates-for-localhost/ -->1053 Note that for http, 127.0.0.1 is safer than localhost (as localhost can be mapped to something 1054 other than 127.0.0.1). See also https://letsencrypt.org/docs/certificates-for-localhost/ --> 1043 1055 <target name="get-solr-servlet-url"> 1044 1056 <!--<echo>${default.server.protocol}://${tomcat.server}:${default.tomcat.port}/${solr.context}</echo>--> 1045 <echo> http://127.0.0.1:${localhost.port.http}/${solr.context}</echo>1057 <echo>${local.http.url}/${solr.context}</echo> 1046 1058 </target> 1047 1059 … … 1544 1556 <filter token="tomcat.server" value="${tomcat.server}"/> 1545 1557 <filter token="default.tomcat.port" value="${default.tomcat.port}"/> 1558 <filter token="localhost.server.http" value="${localhost.server.http}"/> 1546 1559 <filter token="localhost.port.http" value="${localhost.port.http}"/> 1547 1560 <filter token="tomcat.port.https" value="${tomcat.port.https}"/> … … 1738 1751 1739 1752 In this case "fullchain_and_prvtkey.pfx" is generated, which is the windows value of ${keystore.file} property 1753 1754 Helpful for debugging: https://stackoverflow.com/questions/10302489/ant-script-have-exec-tag-dump-out-entire-command-line 1740 1755 --> 1741 1756 <exec executable="cmd" osfamily="windows" dir="${basedir}/bin/${os.bin.dir}" spawn="false"> … … 1812 1827 <!-- Finally, mkdir ${packages.home}/tomcat/conf/https_cert 1813 1828 and copy the file /tmp/${tomcat.server}_fullchain_and_key.p12 into it 1814 and rename to a slightly shorter and simpler name. 1829 and rename to a slightly shorter and simpler name, 1830 see https://stackoverflow.com/questions/8971187/ant-renaming-while-copying-file 1815 1831 The file in tmp has root permissions. But copying it from tmp into 1816 1832 the local account will give the copy local account permissions.
Note:
See TracChangeset
for help on using the changeset viewer.