From b634044c1694703cde3c7528158530289baf2d1f Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Fri, 24 Apr 2020 11:33:18 +0100 Subject: [PATCH] Moves ranger into legacy and deletes old web docker files --- .../ranger}/.config/ranger/.gitignore | 0 .../ranger}/.config/ranger/commands.py | 0 .../ranger}/.config/ranger/commands_full.py | 0 .../ranger}/.config/ranger/rc.conf | 0 .../ranger}/.config/ranger/rifle.conf | 0 .../ranger}/.config/ranger/scope.sh | 0 .../apache/sites-enabled/httpd-vhosts.conf | 75 ------------------- docker/web/docker-compose.yml | 20 ----- docker/web/php/Dockerfile | 5 -- docker/web/php/Dockerfile.sample | 5 -- 10 files changed, 105 deletions(-) rename {ranger => LEGACY/ranger}/.config/ranger/.gitignore (100%) rename {ranger => LEGACY/ranger}/.config/ranger/commands.py (100%) rename {ranger => LEGACY/ranger}/.config/ranger/commands_full.py (100%) rename {ranger => LEGACY/ranger}/.config/ranger/rc.conf (100%) rename {ranger => LEGACY/ranger}/.config/ranger/rifle.conf (100%) rename {ranger => LEGACY/ranger}/.config/ranger/scope.sh (100%) delete mode 100644 docker/web/apache/sites-enabled/httpd-vhosts.conf delete mode 100644 docker/web/docker-compose.yml delete mode 100644 docker/web/php/Dockerfile delete mode 100644 docker/web/php/Dockerfile.sample diff --git a/ranger/.config/ranger/.gitignore b/LEGACY/ranger/.config/ranger/.gitignore similarity index 100% rename from ranger/.config/ranger/.gitignore rename to LEGACY/ranger/.config/ranger/.gitignore diff --git a/ranger/.config/ranger/commands.py b/LEGACY/ranger/.config/ranger/commands.py similarity index 100% rename from ranger/.config/ranger/commands.py rename to LEGACY/ranger/.config/ranger/commands.py diff --git a/ranger/.config/ranger/commands_full.py b/LEGACY/ranger/.config/ranger/commands_full.py similarity index 100% rename from ranger/.config/ranger/commands_full.py rename to LEGACY/ranger/.config/ranger/commands_full.py diff --git a/ranger/.config/ranger/rc.conf b/LEGACY/ranger/.config/ranger/rc.conf similarity index 100% rename from ranger/.config/ranger/rc.conf rename to LEGACY/ranger/.config/ranger/rc.conf diff --git a/ranger/.config/ranger/rifle.conf b/LEGACY/ranger/.config/ranger/rifle.conf similarity index 100% rename from ranger/.config/ranger/rifle.conf rename to LEGACY/ranger/.config/ranger/rifle.conf diff --git a/ranger/.config/ranger/scope.sh b/LEGACY/ranger/.config/ranger/scope.sh similarity index 100% rename from ranger/.config/ranger/scope.sh rename to LEGACY/ranger/.config/ranger/scope.sh diff --git a/docker/web/apache/sites-enabled/httpd-vhosts.conf b/docker/web/apache/sites-enabled/httpd-vhosts.conf deleted file mode 100644 index 61c79549..00000000 --- a/docker/web/apache/sites-enabled/httpd-vhosts.conf +++ /dev/null @@ -1,75 +0,0 @@ -# Virtual Hosts -# -# Required modules: mod_log_config - -# If you want to maintain multiple domains/hostnames on your -# machine you can setup VirtualHost containers for them. Most configurations -# use only name-based virtual hosts so the server doesn't need to worry about -# IP addresses. This is indicated by the asterisks in the directives below. -# -# Please see the documentation at -# -# for further details before you try to setup virtual hosts. -# -# You may use the command line option '-S' to verify your virtual host -# configuration. - -# -# VirtualHost example: -# Almost any Apache directive may go into a VirtualHost container. -# The first VirtualHost section is used for all requests that do not -# match a ServerName or ServerAlias in any block. -# - - ServerName test.local - ServerAlias *.local - VirtualDocumentRoot /var/www/html/%-2/public_html - CustomLog /var/www/html/access.log vhost_combined - ErrorLog /var/www/html/error.log - Options +FollowSymLinks - php_flag session.auto_start off - php_value max_execution_time 18000 - php_flag suhosin.session.cryptua off - - -# -# ServerName test.local -# ServerAlias *.local -# VirtualDocumentRoot /var/www/html/%-2/public_html -# CustomLog /var/www/html/access.log vhost_combined -# ErrorLog /var/www/html/error.log -# Options +FollowSymLinks -# php_flag session.auto_start off -# php_value max_execution_time 18000 -# php_flag suhosin.session.cryptua off -# SSLEngine On -# #SSLCertificateFile /var/www/html/root-ca/certs/local.cert.pem -# #SSLCertificateKeyFile /var/www/html/root-ca/private/local.key.pem -# - - - ServerName test.local.jh - ServerAlias *.local.jh - VirtualDocumentRoot /var/www/html/%-3/public_html - CustomLog /var/www/html/access.log vhost_combined - ErrorLog /var/www/html/error.log - Options +FollowSymLinks - php_flag session.auto_start off - php_value max_execution_time 18000 - php_flag suhosin.session.cryptua off - - - - ServerName test.local.jh - ServerAlias *.local.jh - VirtualDocumentRoot /var/www/html/%-3/public_html - CustomLog /var/www/html/access.log vhost_combined - ErrorLog /var/www/html/error.log - Options +FollowSymLinks - php_flag session.auto_start off - php_value max_execution_time 18000 - php_flag suhosin.session.cryptua off - SSLEngine On - SSLCertificateFile /var/www/html/root-ca/certs/local.cert.pem - SSLCertificateKeyFile /var/www/html/root-ca/private/local.key.pem - diff --git a/docker/web/docker-compose.yml b/docker/web/docker-compose.yml deleted file mode 100644 index 33ec81c6..00000000 --- a/docker/web/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3' -services: - php: - container_name: php - build: ./php/ - volumes: - - /home/jonathan/Sites/:/var/www/html/ - - /home/jonathan/.dotfiles/docker/web/apache/sites-enabled/:/etc/apache2/sites-enabled - ports: - - 80:80 - - 443:443 - restart: always - mysql: - container_name: mysql - image: mysql:5.6 - ports: - - 3306:3306 - environment: - MYSQL_ROOT_PASSWORD: root - restart: always diff --git a/docker/web/php/Dockerfile b/docker/web/php/Dockerfile deleted file mode 100644 index f2dd4717..00000000 --- a/docker/web/php/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM php:7.3-apache - -RUN a2enmod rewrite vhost_alias ssl - -RUN docker-php-ext-install mysqli pdo pdo_mysql diff --git a/docker/web/php/Dockerfile.sample b/docker/web/php/Dockerfile.sample deleted file mode 100644 index ac3f00cc..00000000 --- a/docker/web/php/Dockerfile.sample +++ /dev/null @@ -1,5 +0,0 @@ -FROM php:%version%-apache - -RUN a2enmod rewrite vhost_alias ssl - -RUN docker-php-ext-install mysqli pdo pdo_mysql