Commit 3e951336 authored by Joachim Mathes's avatar Joachim Mathes

TASK: Update documentation

parent e1910349
......@@ -10,23 +10,27 @@ box for typo3.org development. Thus, for the moment:
`be_users` are publicly available, though hashed by TYPO3.
* **the database password is publicly available.**
All information in [LocalConfiguration.php](https://gitlab.pluspunkthosting.de/T3O/typo3.org/blob/master/html/typo3conf/LocalConfiguration.php)
All information in [LocalConfiguration.php](../html/typo3conf/LocalConfiguration.php)
is currently publicly available via https://gitlab.pluspunkthosting.de/T3O/typo3.org/
* **if the community is interested in using this box for development, security issues have to be reconsidered, of course.**
As a general concept consider the box as a breakable toy.
The box as a breakable toy
--------------------------
As a general concept consider the box as a breakable toy. Feel free do destroy the box at any time, but keep in mind
that anything _inside_ the box will be lost.
Questions
---------
* See https://proserver.punkt.de and https://punkt.de/de/blog/2016/freebsd-jails.html for further information on proServer and jail technology.
* Feel free to send an email to technik@punkt.de for any questions.
* Feel free to send an email to [technik@punkt.de](mailto:technik@punkt.de) for any questions.
Sections
--------
* [Prerequisites](documentation/prerequisites.md)
* [Installation](https://gitlab.pluspunkthosting.de/T3O/typo3.org/blob/master/documentation/installation.md)
* [Deployment](https://gitlab.pluspunkthosting.de/T3O/typo3.org/blob/master/documentation/deployment.md)
* [PhpStorm](https://gitlab.pluspunkthosting.de/T3O/typo3.org/blob/master/documentation/phpstorm/phpstorm.md)
* [Installation](documentation/installation.md)
* [Deployment](documentation/deployment.md)
* [PhpStorm](documentation/phpstorm/phpstorm.md)
......@@ -3,7 +3,7 @@ Deployment
For deployment you need to have access to `vpro0100.proserver.punkt.de` as user `proserver`.
Thus, your public key has to be provided. Please inform one of the already registered users
or ask technik@punkt.de if you need access.
or ask [technik@punkt.de](mailto:technik@punkt.de) if you need access.
Login as user `proserver` to allow agent forwarding. Login as user `vagrant` and sudo to `proserver` won't work!
......
......@@ -7,16 +7,17 @@ Go to your project directory and run `fab initialize_proserver_box`. It
2. puts the public key of box user `vagrant` to box user `proserver`.
3. injects the project from your host's workspace into the box.
4. runs composer to initialize the project.
The `composer` run will be interrupted and ask you for `username` and `password` of
your `typo3.org` account to download `t3o/t3olayout`.
```
...
[172.17.28.100] out: - Installing typo3/cms (8.6.0) Downloading: 100%
[172.17.28.100] out: - Installing symfony/process (v3.2.4) Downloading: 100%
[172.17.28.100] out: - Installing helhum/typo3-console (4.2.0) Downloading: 100%
[172.17.28.100] out: - Installing t3o/t3olayout (dev-template 45671db) Authentication required (git-t3o.typo3.org):
[172.17.28.100] out: Username:
[172.17.28.100] out: Password:
...
```
Enter valid credentials and the installation will continue.
5. downloads and imports the `t3o` database from `vpro0100.proserver.punkt.de`.
......
PhpStorm
========
![Workspace][workspace]
Prepare your PhpStorm for continuous deployment of your code changes into the box.
We prefer deployment, due to massive performance issues with NFS mounts.
......@@ -30,6 +32,7 @@ Options configuration
* Make sure to activate _Upload external changes_, so file changes induced by `grunt` will be recognized as well.
[workspace]: workspace.png "Workspace"
[connection]: deployment_connection.png "PhpStorm deployment connection"
[mappings]: https://gitlab.pluspunkthosting.de/T3O/typo3.org/raw/master/documentation/phpstorm/deployment_mappings.png "PhpStorm deployment mappings"
[options]: https://gitlab.pluspunkthosting.de/T3O/typo3.org/raw/master/documentation/phpstorm/deployment_options.png "PhpStorm deployment options"
[mappings]: deployment_mappings.png "PhpStorm deployment mappings"
[options]: deployment_options.png "PhpStorm deployment options"
......@@ -13,7 +13,7 @@ The box is tested with
* Python 2.7
* Fabric 1.11.1 with Paramiko 1.16.0
but should work with current versions. Please [let us know](technik@punkt.de), if any problems occur.
but should work with current versions. Please [let us know](mailto:technik@punkt.de), if any problems occur.
Installation
------------
......
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