This repository has been archived by the owner on Mar 8, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1422 from evolution-cms/3.x
Evo 3.0 RC3
- Loading branch information
Showing
6,091 changed files
with
681,783 additions
and
168,560 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # For full documentation and other suggested options, please see | ||
| # http://rtfm.modx.com/evolution/1.0/administration/friendly-url-solutions | ||
| # including for unexpected logouts in multi-server/cloud environments | ||
| # and especially for the first three commented out rules | ||
|
|
||
| #php_flag register_globals Off | ||
| AddDefaultCharset utf-8 | ||
| #php_value date.timezone Europe/Moscow | ||
|
|
||
| #Options +FollowSymlinks | ||
| RewriteEngine On | ||
| RewriteBase / | ||
|
|
||
| # Fix Apache internal dummy connections from breaking [(site_url)] cache | ||
| RewriteCond %{HTTP_USER_AGENT} ^.*internal\ dummy\ connection.*$ [NC] | ||
| RewriteRule .* - [F,L] | ||
|
|
||
| #Remove ///// in url | ||
| #RewriteCond %{REQUEST_URI} ^(.*)/{2,}(.*)$ | ||
| #RewriteRule . %1/%2 [R=301,L] | ||
|
|
||
| #redirect http to https | ||
| #RewriteCond %{HTTP:SSL} !=1 [NC] | ||
| #RewriteRule ^(.*) https://%{SERVER_NAME}/$1 [L,R=301] | ||
| #or | ||
| #RewriteCond %{HTTPS} off | ||
| #RewriteRule ^(.*) https://%{HTTP_HOST}%{REQUEST_URI} | ||
|
|
||
| # Rewrite domain.com -> www.domain.com -- used with SEO Strict URLs plugin | ||
| #RewriteCond %{HTTP_HOST} !^$ | ||
| #RewriteCond %{HTTP_HOST} !^www\. [NC] | ||
| #RewriteCond %{HTTP_HOST} (.+)$ | ||
| #RewriteRule ^(.*)$ http://www.%1/$1 [R=permanent,L] . | ||
|
|
||
| # without www | ||
| #RewriteCond %{HTTP_HOST} . | ||
| #RewriteCond %{HTTP_HOST} !^example\.com [NC] | ||
| #RewriteRule (.*) http://example.com/$1 [R=301,L] | ||
|
|
||
| # without www all domains | ||
| #RewriteCond %{HTTP_HOST} . | ||
| #RewriteCond %{HTTP_HOST} ^www.(.*)$ [NC] | ||
| #RewriteRule ^(.*)$ http://%1/$1 [R=301,L] | ||
|
|
||
| # 301 that removes index.php?q= from all urls | ||
| #RewriteCond %{THE_REQUEST} \s/+index\.php\?&q=([^\s&]+) [NC] | ||
| #RewriteRule ^ /%1? [R=301,L] | ||
| #RewriteCond %{THE_REQUEST} \s/+index\.php\?q=([^\s&]+) [NC] | ||
| #RewriteRule ^ /%1? [R=301,L] | ||
|
|
||
| # Exclude /assets and /manager directories and images from rewrite rules | ||
| RewriteRule ^(manager|assets|js|css|images|img)/.*$ - [L] | ||
| RewriteRule \.(jpg|jpeg|png|gif|ico)$ - [L] | ||
|
|
||
| # For Friendly URLs | ||
| RewriteCond %{REQUEST_FILENAME} !-f | ||
| RewriteCond %{REQUEST_FILENAME} !-d | ||
| RewriteRule ^(.*)$ index.php?q=$1 [L,QSA] | ||
|
|
||
| # Reduce server overhead by enabling output compression if supported. | ||
| #php_flag zlib.output_compression On | ||
| #php_value zlib.output_compression_level 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| FROM php:7.2-fpm | ||
| # Copy composer.lock and composer.json | ||
| COPY composer.json /var/www/ | ||
| # Set working directory | ||
| WORKDIR /var/www | ||
| # Install dependencies | ||
| RUN apt-get update && apt-get install -y \ | ||
| build-essential \ | ||
| libpng-dev \ | ||
| libjpeg62-turbo-dev \ | ||
| libfreetype6-dev \ | ||
| locales \ | ||
| zip \ | ||
| jpegoptim optipng pngquant gifsicle \ | ||
| vim \ | ||
| unzip \ | ||
| git \ | ||
| curl | ||
| # Clear cache | ||
| RUN apt-get clean && rm -rf /var/lib/apt/lists/* | ||
| # Install extensions | ||
| RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl | ||
| RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ | ||
| RUN docker-php-ext-install gd | ||
| # Install composer | ||
| RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer | ||
| # Add user for laravel application | ||
| RUN groupadd -g 1000 www | ||
| RUN useradd -u 1000 -ms /bin/bash -g www www | ||
| # Copy existing application directory contents | ||
| COPY . /var/www | ||
| # Copy existing application directory permissions | ||
| COPY --chown=www:www . /var/www | ||
| # Change current user to www | ||
| USER www | ||
| # Expose port 9000 and start php-fpm server | ||
| EXPOSE 9000 | ||
| CMD ["php-fpm"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| order deny,allow | ||
| allow from all | ||
| deny from all |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| order deny,allow | ||
| deny from all |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| <?php | ||
| define('MGR_DIR', 'manager'); | ||
| <?php | ||
| define('MGR_DIR', 'manager'); |
This file was deleted.
Oops, something went wrong.
0
assets/cache/rss/index.html → assets/captcha/index.html
100755 → 100644
File renamed without changes.
0
manager/includes/noises/noise1.jpg → assets/captcha/noise1.jpg
100755 → 100644
File renamed without changes
0
manager/includes/noises/noise2.jpg → assets/captcha/noise2.jpg
100755 → 100644
File renamed without changes
0
manager/includes/noises/noise3.jpg → assets/captcha/noise3.jpg
100755 → 100644
File renamed without changes
0
manager/includes/noises/noise4.jpg → assets/captcha/noise4.jpg
100755 → 100644
File renamed without changes
Oops, something went wrong.