h-source-users
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[H-source-users] [PATCH] Moving docker files to its own directory.

From: Yuchen Pei
Subject: [H-source-users] [PATCH] Moving docker files to its own directory.
Date: Thu, 26 Aug 2021 11:29:50 +1000
User-agent: mu4e 1.4.13; emacs 27.2 
Also applied the docker patch and removed some commented code.
This will ease deployment, where a post-receive hook copies the document root to /var/www and the docker configs to another dir.
Let me know what you think. Will push to development branch if no opposition. 


From 7b2c76f23be47a8753cfe6d197843a82c6ebf26d Mon Sep 17 00:00:00 2001
From: Yuchen Pei <hi@ypei.me>
Date: Thu, 26 Aug 2021 11:24:58 +1000
Subject: [PATCH] Moving docker files to its own directory.

Also applied the docker patch and removed some commented code.
---
 config-docker.patch                           | 81 -------------------
 .../docker-compose.yml                        |  2 +-
 readme-php5.sh => docker/readme-php5.sh       |  4 +-
 h-source/.htaccess                            | 15 +---
 h-source/Application/Hooks/BeforeChecks.php   |  2 +-
 h-source/Config/Config.php                    |  8 +-
 h-source/admin/Config/Config.php              |  8 +-
 7 files changed, 14 insertions(+), 106 deletions(-)
 delete mode 100644 config-docker.patch
 rename docker-compose.yml => docker/docker-compose.yml (93%)
 rename readme-php5.sh => docker/readme-php5.sh (80%)

diff --git a/config-docker.patch b/config-docker.patch
deleted file mode 100644
index 34f8f8b..0000000
--- a/config-docker.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/h-source/.htaccess b/h-source/.htaccess
-index 56ccf22..61012e2 100755
---- a/h-source/.htaccess
-+++ b/h-source/.htaccess
-@@ -1,7 +1,7 @@
- RewriteEngine On
- 
--RewriteCond %{HTTPS} !^on$
--RewriteRule (.*) https://www.h-node.org/$1 [R,L]
-+#RewriteCond %{HTTPS} !^on$
-+#RewriteRule (.*) https://www.h-node.org/$1 [R,L]
- 
- # <IfModule mod_rewrite.c>
- #     Options +FollowSymlinks
-diff --git a/h-source/Application/Hooks/BeforeChecks.php 
b/h-source/Application/Hooks/BeforeChecks.php
-index 6f200e6..47e7936 100755
---- a/h-source/Application/Hooks/BeforeChecks.php
-+++ b/h-source/Application/Hooks/BeforeChecks.php
-@@ -13,7 +13,7 @@ if (!defined('EG')) die('Direct access not allowed!');
- 
- Params::$htmlentititiesCharset = "UTF-8";
- 
--Params::$useHttps = true;
-+Params::$useHttps = false;
- 
- Params::$allowedSanitizeFunc .= ",sanitizeString,sanitizeAlphanum";
- 
-diff --git a/h-source/Config/Config.php b/h-source/Config/Config.php
-index bea5562..1290751 100755
---- a/h-source/Config/Config.php
-+++ b/h-source/Config/Config.php
-@@ -23,10 +23,10 @@
- if (!defined('EG')) die('Direct access not allowed!');
- 
- 
--define('DB', '');
--define('USER', '');
-+define('DB', 'hnode');
-+define('USER', 'root');
- define('PWD', '');
--define('HOST', '');
-+define('HOST', 'localhost');
- 
- /*default controller name*/
- define('DEFAULT_CONTROLLER','home');
-@@ -35,7 +35,7 @@ define('DEFAULT_CONTROLLER','home');
- define('DEFAULT_ACTION','index');
- 
- /*website parameters*/
--define('DOMAIN_NAME','h-source');
-+define('DOMAIN_NAME','localhost');
- 
- /*type of database.*/
- //it can be: Mysql, Mysqli or None (first letter in uppercase)
-diff --git a/h-source/admin/Config/Config.php 
b/h-source/admin/Config/Config.php
-index 24d2e57..3f7866d 100755
---- a/h-source/admin/Config/Config.php
-+++ b/h-source/admin/Config/Config.php
-@@ -6,10 +6,10 @@
- if (!defined('EG')) die('Direct access not allowed!');
- 
- 
--define('DB', '');
--define('USER', '');
-+define('DB', 'hnode');
-+define('USER', 'root');
- define('PWD', '');
--define('HOST', '');
-+define('HOST', 'localhost');
- 
- /*default controller name*/
- define('DEFAULT_CONTROLLER','adminusers');
-@@ -18,7 +18,7 @@ define('DEFAULT_CONTROLLER','adminusers');
- define('DEFAULT_ACTION','login');
- 
- /*website parameters*/
--define('DOMAIN_NAME','h-source/admin');
-+define('DOMAIN_NAME','localhost/admin');
- 
- /*type of database.*/
- //it can be: Mysql, Mysqli or None (first letter in uppercase)
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 93%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 3b70319..c3f2349 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -10,5 +10,5 @@ services:
       - 80:80
       - 3306:3306
     volumes:
-      - "./h-source:/app"
+      - "../h-source:/app"
       - "./mysql:/var/lib/mysql"
diff --git a/readme-php5.sh b/docker/readme-php5.sh
similarity index 80%
rename from readme-php5.sh
rename to docker/readme-php5.sh
index 4bad3aa..fb62a4d 100755
--- a/readme-php5.sh
+++ b/docker/readme-php5.sh
@@ -12,9 +12,7 @@
 #      > create database hnode;
 #      > ^D
 # and populate the schema/initial data with:
-#      mysql -uadmin -pXXX -h127.0.0.1 hnode < h-source/tables.sql
-
-patch -p1 < config-docker.patch
+#      mysql -uadmin -pXXX -h127.0.0.1 hnode < ../h-source/tables.sql
 
 docker-compose up --build lamp-php5
 
diff --git a/h-source/.htaccess b/h-source/.htaccess
index 56ccf22..95ab62f 100755
--- a/h-source/.htaccess
+++ b/h-source/.htaccess
@@ -1,14 +1,5 @@
 RewriteEngine On
 
-RewriteCond %{HTTPS} !^on$
-RewriteRule (.*) https://www.h-node.org/$1 [R,L]
-
-# <IfModule mod_rewrite.c>
-#      Options +FollowSymlinks
-#    RewriteEngine on
-       RewriteCond %{REQUEST_FILENAME} !-f
-       RewriteCond %{REQUEST_FILENAME} !-d
-       RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
-# </IfModule>
-
- 
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
diff --git a/h-source/Application/Hooks/BeforeChecks.php 
b/h-source/Application/Hooks/BeforeChecks.php
index 6f200e6..47e7936 100755
--- a/h-source/Application/Hooks/BeforeChecks.php
+++ b/h-source/Application/Hooks/BeforeChecks.php
@@ -13,7 +13,7 @@ if (!defined('EG')) die('Direct access not allowed!');
 
 Params::$htmlentititiesCharset = "UTF-8";
 
-Params::$useHttps = true;
+Params::$useHttps = false;
 
 Params::$allowedSanitizeFunc .= ",sanitizeString,sanitizeAlphanum";
 
diff --git a/h-source/Config/Config.php b/h-source/Config/Config.php
index bea5562..1290751 100755
--- a/h-source/Config/Config.php
+++ b/h-source/Config/Config.php
@@ -23,10 +23,10 @@
 if (!defined('EG')) die('Direct access not allowed!');
 
 
-define('DB', '');
-define('USER', '');
+define('DB', 'hnode');
+define('USER', 'root');
 define('PWD', '');
-define('HOST', '');
+define('HOST', 'localhost');
 
 /*default controller name*/
 define('DEFAULT_CONTROLLER','home');
@@ -35,7 +35,7 @@ define('DEFAULT_CONTROLLER','home');
 define('DEFAULT_ACTION','index');
 
 /*website parameters*/
-define('DOMAIN_NAME','h-source');
+define('DOMAIN_NAME','localhost');
 
 /*type of database.*/
 //it can be: Mysql, Mysqli or None (first letter in uppercase)
diff --git a/h-source/admin/Config/Config.php b/h-source/admin/Config/Config.php
index 24d2e57..3f7866d 100755
--- a/h-source/admin/Config/Config.php
+++ b/h-source/admin/Config/Config.php
@@ -6,10 +6,10 @@
 if (!defined('EG')) die('Direct access not allowed!');
 
 
-define('DB', '');
-define('USER', '');
+define('DB', 'hnode');
+define('USER', 'root');
 define('PWD', '');
-define('HOST', '');
+define('HOST', 'localhost');
 
 /*default controller name*/
 define('DEFAULT_CONTROLLER','adminusers');
@@ -18,7 +18,7 @@ define('DEFAULT_CONTROLLER','adminusers');
 define('DEFAULT_ACTION','login');
 
 /*website parameters*/
-define('DOMAIN_NAME','h-source/admin');
+define('DOMAIN_NAME','localhost/admin');
 
 /*type of database.*/
 //it can be: Mysql, Mysqli or None (first letter in uppercase)
-- 
2.33.0



--
Best,
Yuchen

PGP Key: 47F9 D050 1E11 8879 9040  4941 2126 7E93 EF86 DFD0
          <https://ypei.me/assets/ypei-pubkey.txt>

Attachment: signature.asc
Description: PGP signature

reply via email to
[Prev in Thread] Current Thread [Next in Thread]