Переглянути джерело

Merge branch 'dev' of craft-in-america/yoac into master

master
Alej 1 рік тому
джерело
коміт
18978e54cc
4 змінених файлів з 20 додано та 18 видалено
  1. 3
    4
      .gitignore
  2. 5
    3
      configs/wp-config.php
  3. 11
    10
      docker-compose.yml
  4. 1
    1
      uploads.ini

+ 3
- 4
.gitignore Переглянути файл

@@ -21,13 +21,12 @@ Thumbs.db
21 21
 uploads
22 22
 db
23 23
 **/node_modules
24
-plugins/hello.php
25
-plugins/akismet
26
-plugins/regenerate-thumbnails
27
-plugins/wp-rest-cache
24
+plugins/*
25
+yoac-theme/assets/fonts/*
28 26
 
29 27
 # Env
30 28
 .env
31 29
 
32 30
 # Build files
33 31
 yoac-theme/build
32
+yoac-theme/screenshot.png

+ 5
- 3
configs/wp-config.php Переглянути файл

@@ -82,7 +82,11 @@ if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROT
82 82
         $_SERVER['HTTPS'] = 'on';
83 83
 }
84 84
 
85
-/* That's all, stop editing! Happy blogging. */
85
+/** Limit revisions */
86
+define('WP_POST_REVISIONS', 2);
87
+
88
+define( 'WP_MEMORY_LIMIT', '256M' );
89
+/* That's all, stop editing! Happy publishing. */
86 90
 
87 91
 /** Absolute path to the WordPress directory. */
88 92
 if ( !defined('ABSPATH') )
@@ -100,5 +104,3 @@ if(defined('IS_DEV') && IS_DEV === 'true') {
100 104
         $_SERVER['HTTPS'] = 'off';
101 105
 }
102 106
 
103
-/** Limit reivisions */
104
-define('WP_POST_REVISIONS', 2);

+ 11
- 10
docker-compose.yml Переглянути файл

@@ -1,4 +1,4 @@
1
-version: '3'
1
+# version: '3'
2 2
 
3 3
 services:
4 4
     yoac-wp:
@@ -12,6 +12,7 @@ services:
12 12
             - ./uploads:/var/www/html/wp-content/uploads
13 13
             - ./plugins:/var/www/html/wp-content/plugins
14 14
             - ./yoac-theme:/var/www/html/wp-content/themes/yoac-theme
15
+            - ./bricks-yoac-child:/var/www/html/wp-content/themes/bricks-yoac-child
15 16
             - ./uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
16 17
         ports:
17 18
             - 8080:80
@@ -22,8 +23,8 @@ services:
22 23
             WORDPRESS_DB_USER: '${WORDPRESS_DB_USER}'
23 24
             WORDPRESS_DB_PASSWORD: '${WORDPRESS_DB_PASSWORD}'
24 25
             IS_DEV: '${IS_DEV}'
25
-        networks:
26
-            - staging_network
26
+        # networks:
27
+        #     - staging_network
27 28
 
28 29
     yoac-db:
29 30
         image: mariadb:latest
@@ -37,8 +38,8 @@ services:
37 38
             MYSQL_DATABASE: '${DB_NAME}'
38 39
         volumes:
39 40
             - db:/var/lib/mysql
40
-        networks:
41
-            - staging_network
41
+        # networks:
42
+        #     - staging_network
42 43
 
43 44
     yoac-admin:
44 45
         image: adminer
@@ -52,12 +53,12 @@ services:
52 53
             ADMINER_DESIGN: pepa-linha-dark
53 54
         volumes:
54 55
             - ./adminer.ini:/usr/local/etc/php/conf.d/uploads.ini
55
-        networks:
56
-            - staging_network
56
+        # networks:
57
+        #     - staging_network
57 58
 
58 59
 volumes:
59 60
     db:
60 61
 
61
-networks:
62
-    staging_network:
63
-        external: true
62
+# networks:
63
+#     staging_network:
64
+#         external: true

+ 1
- 1
uploads.ini Переглянути файл

@@ -1,5 +1,5 @@
1 1
 file_uploads = On
2 2
 memory_limit = 512M
3
-upload_max_filesize = 10M
3
+upload_max_filesize = 200M
4 4
 post_max_size = 20M
5 5
 max_execution_time = 1200

Завантаження…
Відмінити
Зберегти