Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit fa16fab

Browse files
committed
Fixes #2174: Remove Pimp my Log from installed_extras.
1 parent a1a91ed commit fa16fab

File tree

20 files changed

+4
-217
lines changed

20 files changed

+4
-217
lines changed

README.md

+2-15
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Drupal VM installs the following on an Ubuntu 18.04 (by default) linux VM:
3434
- Blackfire, XHProf, or Tideways for profiling your code
3535
- XDebug, for debugging your code
3636
- Adminer, for accessing databases directly
37-
- Pimp my Log, for easy viewing of log files
3837
- MailHog, for catching and debugging email
3938

4039
It should take 5-10 minutes to build or rebuild the VM from scratch on a decent broadband connection.
@@ -109,7 +108,7 @@ Note: *By default Drupal VM is configured to use `192.168.88.88` as its IP, if y
109108

110109
## Extra software/utilities
111110

112-
By default, this VM includes the extras listed in the `config.yml` option `installed_extras`:
111+
By default, this VM includes the extras listed in the `config.yml` option `installed_extras`, for example:
113112

114113
installed_extras:
115114
- adminer
@@ -119,19 +118,7 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
119118
# - elasticsearch
120119
# - java
121120
- mailhog
122-
# - memcached
123-
# - newrelic
124-
# - nodejs
125-
- pimpmylog
126-
# - redis
127-
# - ruby
128-
# - selenium
129-
# - solr
130-
# - tideways
131-
# - upload-progress
132-
- varnish
133-
# - xdebug
134-
# - xhprof
121+
[...]
135122

136123
If you don't want or need one or more of these extras, just delete them or comment them from the list. This is helpful if you want to reduce PHP memory usage or otherwise conserve system resources.
137124

default.config.yml

-13
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@ apache_vhosts:
142142
documentroot: "{{ php_xhprof_html_dir }}"
143143
extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
144144

145-
- servername: "pimpmylog.{{ vagrant_hostname }}"
146-
documentroot: "{{ pimpmylog_install_dir }}"
147-
extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
148-
149145
- servername: "{{ vagrant_ip }}"
150146
serveralias: "dashboard.{{ vagrant_hostname }}"
151147
documentroot: "{{ dashboard_install_dir }}"
@@ -177,10 +173,6 @@ nginx_hosts:
177173
root: "{{ php_xhprof_html_dir }}"
178174
is_php: true
179175

180-
- server_name: "pimpmylog.{{ vagrant_hostname }}"
181-
root: "{{ pimpmylog_install_dir }}"
182-
is_php: true
183-
184176
- server_name: "{{ vagrant_ip }} dashboard.{{ vagrant_hostname }}"
185177
root: "{{ dashboard_install_dir }}"
186178
is_php: true
@@ -223,7 +215,6 @@ installed_extras:
223215
# - memcached
224216
# - newrelic
225217
# - nodejs
226-
- pimpmylog
227218
# - redis
228219
# - ruby
229220
# - selenium
@@ -316,10 +307,6 @@ varnish_default_vcl_template_path: templates/drupalvm.vcl.j2
316307
varnish_default_backend_host: "127.0.0.1"
317308
varnish_default_backend_port: "80"
318309

319-
# Pimp my Log settings.
320-
pimpmylog_install_dir: /usr/share/php/pimpmylog
321-
pimpmylog_grant_all_privs: true
322-
323310
# XDebug configuration. XDebug is disabled by default for better performance.
324311
php_xdebug_version: 2.9.5
325312
php_xdebug_default_enable: 0

docs/deployment/local-codebase.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ By default the domain of your site will be `drupalvm.test` but you can change it
4545
drupal_domain: "local.my-drupal-site.com"
4646
```
4747

48-
If you prefer using your domain as the root of all extra packages installed, ie. `adminer`, `xhprof` and `pimpmylog`, set it as the value of `vagrant_hostname` instead.
48+
If you prefer using your domain as the root of all extra packages installed, ie. `adminer` and `xhprof`, set it as the value of `vagrant_hostname` instead.
4949

5050
```yaml
5151
vagrant_hostname: "my-drupal-site.com"

docs/extras/pimpmylog.md

-20
This file was deleted.

docs/other/production.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
102102

103103
Copy [`examples/prod/prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
104104

105-
The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
105+
The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) disable development-environment tools (like Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
106106

107107
You now have Drupal VM configured for production by default. This is the recommended and safest way, so that you can't accidentally provision a production server with development tools. If desired you can also use the [environment variable `DRUPALVM_ENV`](#production-specific-overrides) to load an additional `<ENV>.config.yml` with production specific overrides. In most cases this is not needed though.
108108

docs/other/wordpress-other-applications.md

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ configure_drush_aliases: false
3838
installed_extras:
3939
- adminer
4040
- mailhog
41-
- pimpmylog
4241

4342
# Add wp-cli
4443
composer_global_packages:

mkdocs.yml

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ pages:
4949
- 'memcached (In-memory cache)': 'extras/memcached.md'
5050
- 'newrelic (Performance monitoring)': 'extras/newrelic.md'
5151
- 'nodejs': 'extras/nodejs.md'
52-
- 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
5352
- 'redis (In-memory database)': 'extras/redis.md'
5453
- 'ruby': 'extras/ruby.md'
5554
- 'selenium (BDD with Behat)': 'extras/selenium.md'

molecule/default/verify.yml

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
- name: Adminer
2727
host_prefix: "adminer."
2828
expected_content: "<title>Login - Adminer"
29-
- name: Pimp My Log
30-
host_prefix: "pimpmylog."
31-
expected_content: "<title>Pimp my Log"
3229
- name: MailHog
3330
host_prefix: ""
3431
port: ":8025"

provisioning/docker/vars/docker-hub-overrides.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ installed_extras:
55
- adminer
66
- drush
77
- mailhog
8-
- pimpmylog
98
# - varnish
109

1110
# Don't build or install Drupal inside the container.

provisioning/playbook.yml

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979

8080
- { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
8181
- { role: geerlingguy.adminer, when: '"adminer" in installed_extras', tags: ['database'] }
82-
- { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
8382
- { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
8483
- { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
8584
- { role: weareinteractive.newrelic, when: '"newrelic" in installed_extras' }

provisioning/requirements.yml

-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ roles:
6262
version: 3.0.0
6363
- name: geerlingguy.php-xhprof
6464
version: 3.0.0
65-
- name: geerlingguy.pimpmylog
66-
version: 1.0.2
6765
- name: geerlingguy.postfix
6866
version: 2.0.0
6967
- name: geerlingguy.postgresql

provisioning/roles/geerlingguy.pimpmylog/.travis.yml

-41
This file was deleted.

provisioning/roles/geerlingguy.pimpmylog/README.md

-49
This file was deleted.

provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml

-5
This file was deleted.

provisioning/roles/geerlingguy.pimpmylog/meta/main.yml

-23
This file was deleted.

provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml

-14
This file was deleted.

provisioning/roles/geerlingguy.pimpmylog/tests/inventory

-1
This file was deleted.

provisioning/roles/geerlingguy.pimpmylog/tests/test.yml

-11
This file was deleted.

provisioning/templates/dashboard.html.j2

-13
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,6 @@
157157
</tr>
158158
{%- endif -%}
159159
{%- endif %}
160-
{% if 'pimpmylog' in installed_extras -%}
161-
{% macro servername() %}{{ getServernameFromDocroot(pimpmylog_install_dir) }}{% endmacro %}
162-
{%- if servername() -%}
163-
<tr>
164-
<th>PimpMyLog</th>
165-
<td><a href="http://{{ servername() }}">{{ servername() }}</a>
166-
</br>
167-
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
168-
<a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
169-
</td>
170-
</tr>
171-
{%- endif -%}
172-
{%- endif %}
173160
{% if 'solr' in installed_extras -%}
174161
{% macro servername() %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endmacro %}
175162
<tr>

provisioning/vars/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
_devtool_docroots:
33
- "{{ adminer_install_dir }}"
4-
- "{{ pimpmylog_install_dir }}"
54
- "{{ php_xhprof_html_dir }}"
65
- "{{ dashboard_install_dir|default('') }}"
76

0 commit comments

Comments
 (0)