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

Commit

Permalink
Fixes #2174: Remove Pimp my Log from installed_extras.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Jul 16, 2021
1 parent a1a91ed commit fa16fab
Show file tree
Hide file tree
Showing 20 changed files with 4 additions and 217 deletions.
17 changes: 2 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ Drupal VM installs the following on an Ubuntu 18.04 (by default) linux VM:
- Blackfire, XHProf, or Tideways for profiling your code
- XDebug, for debugging your code
- Adminer, for accessing databases directly
- Pimp my Log, for easy viewing of log files
- MailHog, for catching and debugging email

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

## Extra software/utilities

By default, this VM includes the extras listed in the `config.yml` option `installed_extras`:
By default, this VM includes the extras listed in the `config.yml` option `installed_extras`, for example:

installed_extras:
- adminer
Expand All @@ -119,19 +118,7 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
# - elasticsearch
# - java
- mailhog
# - memcached
# - newrelic
# - nodejs
- pimpmylog
# - redis
# - ruby
# - selenium
# - solr
# - tideways
# - upload-progress
- varnish
# - xdebug
# - xhprof
[...]

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.

Expand Down
13 changes: 0 additions & 13 deletions default.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@ apache_vhosts:
documentroot: "{{ php_xhprof_html_dir }}"
extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"

- servername: "pimpmylog.{{ vagrant_hostname }}"
documentroot: "{{ pimpmylog_install_dir }}"
extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"

- servername: "{{ vagrant_ip }}"
serveralias: "dashboard.{{ vagrant_hostname }}"
documentroot: "{{ dashboard_install_dir }}"
Expand Down Expand Up @@ -177,10 +173,6 @@ nginx_hosts:
root: "{{ php_xhprof_html_dir }}"
is_php: true

- server_name: "pimpmylog.{{ vagrant_hostname }}"
root: "{{ pimpmylog_install_dir }}"
is_php: true

- server_name: "{{ vagrant_ip }} dashboard.{{ vagrant_hostname }}"
root: "{{ dashboard_install_dir }}"
is_php: true
Expand Down Expand Up @@ -223,7 +215,6 @@ installed_extras:
# - memcached
# - newrelic
# - nodejs
- pimpmylog
# - redis
# - ruby
# - selenium
Expand Down Expand Up @@ -316,10 +307,6 @@ varnish_default_vcl_template_path: templates/drupalvm.vcl.j2
varnish_default_backend_host: "127.0.0.1"
varnish_default_backend_port: "80"

# Pimp my Log settings.
pimpmylog_install_dir: /usr/share/php/pimpmylog
pimpmylog_grant_all_privs: true

# XDebug configuration. XDebug is disabled by default for better performance.
php_xdebug_version: 2.9.5
php_xdebug_default_enable: 0
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/local-codebase.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ By default the domain of your site will be `drupalvm.test` but you can change it
drupal_domain: "local.my-drupal-site.com"
```

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.
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.

```yaml
vagrant_hostname: "my-drupal-site.com"
Expand Down
20 changes: 0 additions & 20 deletions docs/extras/pimpmylog.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/other/production.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.

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`.

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).
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).

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.

Expand Down
1 change: 0 additions & 1 deletion docs/other/wordpress-other-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ configure_drush_aliases: false
installed_extras:
- adminer
- mailhog
- pimpmylog

# Add wp-cli
composer_global_packages:
Expand Down
1 change: 0 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pages:
- 'memcached (In-memory cache)': 'extras/memcached.md'
- 'newrelic (Performance monitoring)': 'extras/newrelic.md'
- 'nodejs': 'extras/nodejs.md'
- 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
- 'redis (In-memory database)': 'extras/redis.md'
- 'ruby': 'extras/ruby.md'
- 'selenium (BDD with Behat)': 'extras/selenium.md'
Expand Down
3 changes: 0 additions & 3 deletions molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
- name: Adminer
host_prefix: "adminer."
expected_content: "<title>Login - Adminer"
- name: Pimp My Log
host_prefix: "pimpmylog."
expected_content: "<title>Pimp my Log"
- name: MailHog
host_prefix: ""
port: ":8025"
Expand Down
1 change: 0 additions & 1 deletion provisioning/docker/vars/docker-hub-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ installed_extras:
- adminer
- drush
- mailhog
- pimpmylog
# - varnish

# Don't build or install Drupal inside the container.
Expand Down
1 change: 0 additions & 1 deletion provisioning/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@

- { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
- { role: geerlingguy.adminer, when: '"adminer" in installed_extras', tags: ['database'] }
- { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
- { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
- { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
- { role: weareinteractive.newrelic, when: '"newrelic" in installed_extras' }
Expand Down
2 changes: 0 additions & 2 deletions provisioning/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ roles:
version: 3.0.0
- name: geerlingguy.php-xhprof
version: 3.0.0
- name: geerlingguy.pimpmylog
version: 1.0.2
- name: geerlingguy.postfix
version: 2.0.0
- name: geerlingguy.postgresql
Expand Down
41 changes: 0 additions & 41 deletions provisioning/roles/geerlingguy.pimpmylog/.travis.yml

This file was deleted.

49 changes: 0 additions & 49 deletions provisioning/roles/geerlingguy.pimpmylog/README.md

This file was deleted.

5 changes: 0 additions & 5 deletions provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml

This file was deleted.

23 changes: 0 additions & 23 deletions provisioning/roles/geerlingguy.pimpmylog/meta/main.yml

This file was deleted.

14 changes: 0 additions & 14 deletions provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml

This file was deleted.

1 change: 0 additions & 1 deletion provisioning/roles/geerlingguy.pimpmylog/tests/inventory

This file was deleted.

11 changes: 0 additions & 11 deletions provisioning/roles/geerlingguy.pimpmylog/tests/test.yml

This file was deleted.

13 changes: 0 additions & 13 deletions provisioning/templates/dashboard.html.j2
Original file line number Diff line number Diff line change
Expand Up @@ -157,19 +157,6 @@
</tr>
{%- endif -%}
{%- endif %}
{% if 'pimpmylog' in installed_extras -%}
{% macro servername() %}{{ getServernameFromDocroot(pimpmylog_install_dir) }}{% endmacro %}
{%- if servername() -%}
<tr>
<th>PimpMyLog</th>
<td><a href="http://{{ servername() }}">{{ servername() }}</a>
</br>
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
<a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
</td>
</tr>
{%- endif -%}
{%- endif %}
{% if 'solr' in installed_extras -%}
{% macro servername() %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endmacro %}
<tr>
Expand Down
1 change: 0 additions & 1 deletion provisioning/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
_devtool_docroots:
- "{{ adminer_install_dir }}"
- "{{ pimpmylog_install_dir }}"
- "{{ php_xhprof_html_dir }}"
- "{{ dashboard_install_dir|default('') }}"

Expand Down

0 comments on commit fa16fab

Please sign in to comment.