Commit fce7d97a authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 267-provide-a-ldap-deletion-option

parents 7b7d692b bb3e080a
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
/commands/*/*.example /commands/*/*.example
/commands/*/README.txt /commands/*/README.txt
/commands/host/launch
/commands/db/mysql
/homeadditions/*.example /homeadditions/*.example
/homeadditions/README.txt /homeadditions/README.txt
/.gitignore
/import.yaml /import.yaml
/docker-compose.yaml /docker-compose.yaml
/db_snapshots /db_snapshots
......
APIVersion: v1.11.2 APIVersion: v1.12.0
name: my.typo3.org name: my.typo3.org
type: typo3 type: typo3
docroot: public docroot: public
...@@ -25,11 +25,11 @@ use_dns_when_possible: true ...@@ -25,11 +25,11 @@ use_dns_when_possible: true
timezone: Europe/Berlin timezone: Europe/Berlin
# This config.yaml was created with ddev version v1.11.2 # This config.yaml was created with ddev version v1.12.0
# webimage: drud/ddev-webserver:v1.11.0 # webimage: drud/ddev-webserver:v1.12.1
# dbimage: drud/ddev-dbserver:v1.11.0-10.2 # dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0
# dbaimage: drud/phpmyadmin:v1.11.0 # dbaimage: drud/phpmyadmin:v1.12.0
# bgsyncimage: drud/ddev-bgsync:v1.11.0 # bgsyncimage: drud/ddev-bgsync:v1.12.0
# However we do not recommend explicitly wiring these images into the # However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev. # config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'. # You can update this config.yaml using 'ddev config'.
...@@ -54,11 +54,17 @@ timezone: Europe/Berlin ...@@ -54,11 +54,17 @@ timezone: Europe/Berlin
# dbaimage: <docker_image> # dbaimage: <docker_image>
# bgsyncimage: <docker_image> # bgsyncimage: <docker_image>
# mariadb_version and mysql_version
# ddev can use many versions of mariadb and mysql
# However these directives are mutually exclusive
# mariadb_version: 10.2
# mysql_version: 8.0
# router_http_port: <port> # Port to be used for http (defaults to port 80) # router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443) # router_https_port: <port> # Port for https (defaults to 443)
# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" # xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands # Note that for most people the commands
# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better, # "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better,
# as leaving xdebug enabled all the time is a big performance hit. # as leaving xdebug enabled all the time is a big performance hit.
...@@ -66,7 +72,7 @@ timezone: Europe/Berlin ...@@ -66,7 +72,7 @@ timezone: Europe/Berlin
# timezone: Europe/Berlin # timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP; # This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone, # it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT # For example Europe/Dublin or MST7MDT
...@@ -88,14 +94,14 @@ timezone: Europe/Berlin ...@@ -88,14 +94,14 @@ timezone: Europe/Berlin
# working_dir: # working_dir:
# web: /var/www/html # web: /var/www/html
# db: /home # db: /home
# would set the default working directory for the web and db services. # would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the # These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run. # directory in which commands passed into ddev exec are run.
# omit_containers: ["dba", "ddev-ssh-agent"] # omit_containers: ["dba", "ddev-ssh-agent"]
# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently # would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
# only those two containers can be omitted here. # only those two containers can be omitted here.
# Note that these containers can also be omitted globally in the # Note that these containers can also be omitted globally in the
# ~/.ddev/global_config.yaml or with the "ddev config global" command. # ~/.ddev/global_config.yaml or with the "ddev config global" command.
# nfs_mount_enabled: false # nfs_mount_enabled: false
...@@ -103,8 +109,8 @@ timezone: Europe/Berlin ...@@ -103,8 +109,8 @@ timezone: Europe/Berlin
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container # See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container
# webcache_enabled: false (deprecated) # webcache_enabled: false (deprecated)
# Was only for macOS, but now deprecated. # Was only for macOS, but now deprecated.
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-webcache_enabled-to-cache-the-project-directory # See https://ddev.readthedocs.io/en/stable/users/performance/#webcache
# host_https_port: "59002" # host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is # The host port binding for https can be explicitly specified. It is
...@@ -135,8 +141,8 @@ timezone: Europe/Berlin ...@@ -135,8 +141,8 @@ timezone: Europe/Berlin
# Extra Debian packages that are needed in the dbimage can be added here # Extra Debian packages that are needed in the dbimage can be added here
# use_dns_when_possible: true # use_dns_when_possible: true
# If the host has internet access and the domain configured can # If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution # successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts # instead of editing /etc/hosts
# Defaults to true # Defaults to true
...@@ -147,13 +153,13 @@ timezone: Europe/Berlin ...@@ -147,13 +153,13 @@ timezone: Europe/Berlin
# pre-v1.9 behavior. # pre-v1.9 behavior.
# ngrok_args: --subdomain mysite --auth username:pass # ngrok_args: --subdomain mysite --auth username:pass
# Provide extra flags to the "ngrok http" command, see # Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h" # https://ngrok.com/docs#http or run "ngrok http -h"
# provider: default # Currently either "default" or "pantheon" # provider: default # Currently either "default" or "pantheon"
# #
# Many ddev commands can be extended to run tasks before or after the # Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db", # ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer" # "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more # See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
# information on the commands that can be extended and the tasks you can define # information on the commands that can be extended and the tasks you can define
......
...@@ -6,6 +6,7 @@ master: ...@@ -6,6 +6,7 @@ master:
writable_mode: chmod writable_mode: chmod
forward_agent: true forward_agent: true
deploy_path: ~/ci deploy_path: ~/ci
keep_releases: 2
develop: develop:
stage: stage stage: stage
hostname: my-stage-v9.typo3.org hostname: my-stage-v9.typo3.org
...@@ -14,3 +15,4 @@ develop: ...@@ -14,3 +15,4 @@ develop:
writable_mode: chmod writable_mode: chmod
forward_agent: true forward_agent: true
deploy_path: ~/ci/ deploy_path: ~/ci/
keep_releases: 5
This diff is collapsed.
...@@ -15,6 +15,9 @@ plugin.tx_femanager { ...@@ -15,6 +15,9 @@ plugin.tx_femanager {
uniqueInLdap = 1 uniqueInLdap = 1
notInOldUserTable = 1 notInOldUserTable = 1
lowerChars = 1 lowerChars = 1
min = 6
max = 30
mustNotInclude = space
} }
password { password {
min = 12 min = 12
......
...@@ -23,39 +23,3 @@ plugin.tx_t3omy { ...@@ -23,39 +23,3 @@ plugin.tx_t3omy {
config.tx_realurl_enable = 1 config.tx_realurl_enable = 1
[applicationContext = Production/Live]
config.additionalHeaders {
10.header = X-Powered-By: nothing
20.header = Content-Security-Policy: default-src 'self' *.typo3.org; script-src 'unsafe-inline' *.typo3.org; font-src 'self' *.typo3.org fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com avatars.slack-edge.com
30.header = X-Content-Security-Policy: default-src 'self' *.typo3.org; script-src 'unsafe-inline' *.typo3.org; font-src 'self' *.typo3.org fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com avatars.slack-edge.com
40.header = X-Webkit-CSP: default-src 'self' *.typo3.org; script-src 'unsafe-inline' *.typo3.org; font-src 'self' *.typo3.org fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com avatars.slack-edge.com
}
#### Set piwik tracking code for my.typo3.org
page {
headerData {
1501157682 = TEXT
1501157682.value (
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.typo3.org/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '37']);
_paq.push(['setVisitorCookieTimeout', '2592000']);
_paq.push(['setSessionCookieTimeout', '0']);
_paq.push(['setDoNotTrack', true]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
)
}
}
[global]
...@@ -26,12 +26,14 @@ ...@@ -26,12 +26,14 @@
<f:translate key="titleUpdateProfile" /> <f:translate key="titleUpdateProfile" />
</legend> </legend>
<f:comment> <f:form.hidden name="token" value="{token}" />
If some fields are selected in the flexform
</f:comment> <f:comment>
<f:for each="{femanager:misc.explode(string:'{settings.edit.fields}')}" as="field"> If some fields are selected in the flexform
<f:render partial="Fields/{femanager:misc.upper(string:'{field}')}" arguments="{_all}" /> </f:comment>
</f:for> <f:for each="{femanager:misc.explode(string:'{settings.edit.fields}')}" as="field">
<f:render partial="Fields/{femanager:misc.upper(string:'{field}')}" arguments="{_all}"/>
</f:for>
<div class="femanager_fieldset femanager_submit form-group"> <div class="femanager_fieldset femanager_submit form-group">
<div class="col-sm-10 col-sm-offset-2"> <div class="col-sm-10 col-sm-offset-2">
...@@ -41,12 +43,7 @@ ...@@ -41,12 +43,7 @@
class="btn btn-success btn-large" /> class="btn btn-success btn-large" />
</div> </div>
</div> </div>
</fieldset> </fieldset>
</f:form> </f:form>
</f:then> </f:then>
<f:else> <f:else>
...@@ -58,5 +55,4 @@ ...@@ -58,5 +55,4 @@
</div> </div>
</section> </section>
</f:section> </f:section>
</div> </div>
...@@ -33,9 +33,37 @@ config.tx_extbase { ...@@ -33,9 +33,37 @@ config.tx_extbase {
[applicationContext = Production] [applicationContext = Production]
config.additionalHeaders { config.additionalHeaders {
10.header = X-Powered-By: nothing 10.header = X-Powered-By: nothing
20.header = Content-Security-Policy: default-src 'self' *.typo3.org; script-src 'unsafe-inline' *.typo3.org; font-src 'self' fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com 20.header = Content-Security-Policy: default-src 'self' *.typo3.org; script-src 'unsafe-inline' typo3.azureedge.net *.typo3.org; font-src 'self' *.typo3.org fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com avatars.slack-edge.com
30.header = X-Content-Security-Policy: default-src 'self' *.typo3.org; script-src 'unsafe-inline' *.typo3.org; font-src 'self' fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com 30.header = X-Content-Security-Policy: default-src 'self' *.typo3.org; script-src 'unsafe-inline' typo3.azureedge.net *.typo3.org; font-src 'self' *.typo3.org fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com avatars.slack-edge.com
40.header = X-Webkit-CSP: default-src 'self' *.typo3.org; script-src 'unsafe-inline' *.typo3.org; font-src 'self' fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com 40.header = X-Webkit-CSP: default-src 'self' *.typo3.org; script-src 'unsafe-inline' typo3.azureedge.net *.typo3.org; font-src 'self' *.typo3.org fonts.googleapis.com fonts.gstatic.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self' data: *.typo3.org www.gravatar.com avatars.slack-edge.com
}
#### Set piwik tracking code for my.typo3.org
page {
headerData {
1501157682 = TEXT
1501157682.value (
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.typo3.org/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '37']);
_paq.push(['setVisitorCookieTimeout', '2592000']);
_paq.push(['setSessionCookieTimeout', '0']);
_paq.push(['setDoNotTrack', true]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
)
}
} }
[end] [end]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment