From fefd60950680f3022aeef052de4077f6e018c709 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 17 Dec 2024 18:26:27 +0100 Subject: [PATCH] wip #7217 @3 --- .docker/config/adminer/php.ini | 5 + .docker/config/composer/.htaccess | 1 + .docker/config/composer/auth.json | 5 + .docker/config/cron/crontab | 1 + .docker/config/cron/host | 1 + .docker/config/httpd/httpd.conf | 562 ++++++++++++++++++ .docker/config/imagemagick/policy.xml | 96 +++ .docker/config/mariadb/charset.cnf | 4 + .docker/config/mariadb/connections.cnf | 2 + .docker/config/mariadb/finetuning.cnf | 16 + .docker/config/mariadb/json.cnf | 3 + .docker/config/mariadb/logs.cnf | 8 + .docker/config/mariadb/sql_mode.cnf | 2 + .docker/config/passwords | 1 + .docker/config/php.ini | 7 + .docker/config/rsyslog/50-default.conf | 48 ++ .docker/config/rsyslog/init.d | 137 +++++ .docker/config/rsyslog/rsyslog.conf | 60 ++ .docker/config/ssh/root/authorized_keys2 | 2 + .docker/config/ssh/server/moduli | 0 .docker/config/ssh/server/ssh_config | 0 .docker/config/ssh/server/ssh_host_dsa_key | 21 + .../config/ssh/server/ssh_host_dsa_key.pub | 1 + .docker/config/ssh/server/ssh_host_ecdsa_key | 9 + .../config/ssh/server/ssh_host_ecdsa_key.pub | 1 + .../config/ssh/server/ssh_host_ed25519_key | 7 + .../ssh/server/ssh_host_ed25519_key.pub | 1 + .docker/config/ssh/server/ssh_host_rsa_key | 38 ++ .../config/ssh/server/ssh_host_rsa_key.pub | 1 + .docker/config/ssh/server/sshd_config | 115 ++++ .docker/config/ssh/user/authorized_keys2 | 2 + .docker/config/sudoers | 1 + .docker/images/elasticsearch/Dockerfile | 2 + .docker/images/httpd/Dockerfile | 3 + .docker/images/php-5.6-fpm/Dockerfile | 82 +++ .docker/images/php-5.6-fpm/overrides.conf | 17 + .docker/images/php-5.6-fpm/php-fpm-startup | 33 + .docker/images/php-fpm/Dockerfile | 79 +++ .docker/images/php-fpm/overrides.conf | 37 ++ .docker/images/php-fpm/startup | 33 + .docker/production/docker-compose.yml | 105 ++++ .docker/production/dockerterminal.bat | 3 + .docker/production/update | 15 + .idea/watcherTasks.xml | 4 + framework/application/configs/application.ini | 7 +- framework/application/forms/CMS/Home.php | 15 +- .../application/forms/CMS/Sub/Contact.php | 4 +- .../forms/CMS/Sub/Contact/Office.php | 6 +- .../application/forms/CMS/Sub/Home/Agence.php | 10 +- framework/application/forms/Settings.php | 21 +- .../application/layouts/scripts/layout.phtml | 2 +- .../views/helpers/FooterContact.php | 57 +- framework/application/views/helpers/Liste.php | 5 + less/common.less | 14 +- less/footer.less | 43 +- less/home.less | 4 +- less/list.less | 157 ++--- 57 files changed, 1752 insertions(+), 164 deletions(-) create mode 100644 .docker/config/adminer/php.ini create mode 100644 .docker/config/composer/.htaccess create mode 100644 .docker/config/composer/auth.json create mode 100644 .docker/config/cron/crontab create mode 100644 .docker/config/cron/host create mode 100644 .docker/config/httpd/httpd.conf create mode 100644 .docker/config/imagemagick/policy.xml create mode 100644 .docker/config/mariadb/charset.cnf create mode 100644 .docker/config/mariadb/connections.cnf create mode 100644 .docker/config/mariadb/finetuning.cnf create mode 100644 .docker/config/mariadb/json.cnf create mode 100644 .docker/config/mariadb/logs.cnf create mode 100644 .docker/config/mariadb/sql_mode.cnf create mode 100644 .docker/config/passwords create mode 100644 .docker/config/php.ini create mode 100644 .docker/config/rsyslog/50-default.conf create mode 100644 .docker/config/rsyslog/init.d create mode 100644 .docker/config/rsyslog/rsyslog.conf create mode 100644 .docker/config/ssh/root/authorized_keys2 create mode 100644 .docker/config/ssh/server/moduli create mode 100644 .docker/config/ssh/server/ssh_config create mode 100644 .docker/config/ssh/server/ssh_host_dsa_key create mode 100644 .docker/config/ssh/server/ssh_host_dsa_key.pub create mode 100644 .docker/config/ssh/server/ssh_host_ecdsa_key create mode 100644 .docker/config/ssh/server/ssh_host_ecdsa_key.pub create mode 100644 .docker/config/ssh/server/ssh_host_ed25519_key create mode 100644 .docker/config/ssh/server/ssh_host_ed25519_key.pub create mode 100644 .docker/config/ssh/server/ssh_host_rsa_key create mode 100644 .docker/config/ssh/server/ssh_host_rsa_key.pub create mode 100644 .docker/config/ssh/server/sshd_config create mode 100644 .docker/config/ssh/user/authorized_keys2 create mode 100644 .docker/config/sudoers create mode 100644 .docker/images/elasticsearch/Dockerfile create mode 100644 .docker/images/httpd/Dockerfile create mode 100644 .docker/images/php-5.6-fpm/Dockerfile create mode 100644 .docker/images/php-5.6-fpm/overrides.conf create mode 100644 .docker/images/php-5.6-fpm/php-fpm-startup create mode 100644 .docker/images/php-fpm/Dockerfile create mode 100644 .docker/images/php-fpm/overrides.conf create mode 100644 .docker/images/php-fpm/startup create mode 100644 .docker/production/docker-compose.yml create mode 100644 .docker/production/dockerterminal.bat create mode 100644 .docker/production/update create mode 100644 .idea/watcherTasks.xml diff --git a/.docker/config/adminer/php.ini b/.docker/config/adminer/php.ini new file mode 100644 index 0000000..3b3c80e --- /dev/null +++ b/.docker/config/adminer/php.ini @@ -0,0 +1,5 @@ +upload_max_filesize = 500M +post_max_size = 500M +memory_limit = 4G +max_execution_time = 6000 +max_input_vars = 5000 diff --git a/.docker/config/composer/.htaccess b/.docker/config/composer/.htaccess new file mode 100644 index 0000000..14249c5 --- /dev/null +++ b/.docker/config/composer/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/.docker/config/composer/auth.json b/.docker/config/composer/auth.json new file mode 100644 index 0000000..6b9274a --- /dev/null +++ b/.docker/config/composer/auth.json @@ -0,0 +1,5 @@ +{ + "github-oauth": { + "github.com": "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" + } +} diff --git a/.docker/config/cron/crontab b/.docker/config/cron/crontab new file mode 100644 index 0000000..2840a32 --- /dev/null +++ b/.docker/config/cron/crontab @@ -0,0 +1 @@ +#* * * * * runuser -l bloomsburie -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2 diff --git a/.docker/config/cron/host b/.docker/config/cron/host new file mode 100644 index 0000000..7f3d8ff --- /dev/null +++ b/.docker/config/cron/host @@ -0,0 +1 @@ +3 4 * * * root /docker/bloomsburie/build >/dev/null 2>/dev/null diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf new file mode 100644 index 0000000..d853c2b --- /dev/null +++ b/.docker/config/httpd/httpd.conf @@ -0,0 +1,562 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/usr/local/apache2" + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule mpm_event_module modules/mod_mpm_event.so +#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +#LoadModule mpm_worker_module modules/mod_mpm_worker.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule isapi_module modules/mod_isapi.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule bucketeer_module modules/mod_bucketeer.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule echo_module modules/mod_echo.so +#LoadModule example_hooks_module modules/mod_example_hooks.so +#LoadModule case_filter_module modules/mod_case_filter.so +#LoadModule case_filter_in_module modules/mod_case_filter_in.so +#LoadModule example_ipc_module modules/mod_example_ipc.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule data_module modules/mod_data.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +#LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule deflate_module modules/mod_deflate.so +#LoadModule xml2enc_module modules/mod_xml2enc.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule brotli_module modules/mod_brotli.so +LoadModule mime_module modules/mod_mime.so +#LoadModule ldap_module modules/mod_ldap.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule logio_module modules/mod_logio.so +#LoadModule lua_module modules/mod_lua.so +LoadModule env_module modules/mod_env.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +LoadModule remoteip_module modules/mod_remoteip.so +LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule ssl_module modules/mod_ssl.so +#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so +#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so +#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so +#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so +#LoadModule dialup_module modules/mod_dialup.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule md_module modules/mod_md.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule info_module modules/mod_info.so +#LoadModule suexec_module modules/mod_suexec.so + + #LoadModule cgid_module modules/mod_cgid.so + + + #LoadModule cgi_module modules/mod_cgi.so + +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule imagemap_module modules/mod_imagemap.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +LoadModule rewrite_module modules/mod_rewrite.so + +LoadModule xsendfile_module /usr/lib/apache2/modules/mod_xsendfile.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User www-data +Group www-data + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/application/" + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride All + + # + # Controls who can get stuff from this server. + # + Require all granted + + +ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://bloomsburie:9000/application//$1" timeout=1800 + +XSendFile on +XSendFilePath /application + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html index.php + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog /proc/self/fd/2 + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + CustomLog /proc/self/fd/1 common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + #CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +#Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include conf/extra/httpd-info.conf + +# Virtual hosts +#Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +#Include conf/extra/httpd-ssl.conf +# +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + + +RemoteIPHeader X-Forwarded-For + diff --git a/.docker/config/imagemagick/policy.xml b/.docker/config/imagemagick/policy.xml new file mode 100644 index 0000000..cf31ee6 --- /dev/null +++ b/.docker/config/imagemagick/policy.xml @@ -0,0 +1,96 @@ + + + + + + ]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.docker/config/mariadb/charset.cnf b/.docker/config/mariadb/charset.cnf new file mode 100644 index 0000000..a624a11 --- /dev/null +++ b/.docker/config/mariadb/charset.cnf @@ -0,0 +1,4 @@ +[mariadb] +collation-server = utf8mb4_unicode_ci +init-connect='SET NAMES utf8mb4' +character-set-server = utf8mb4 diff --git a/.docker/config/mariadb/connections.cnf b/.docker/config/mariadb/connections.cnf new file mode 100644 index 0000000..f623ae6 --- /dev/null +++ b/.docker/config/mariadb/connections.cnf @@ -0,0 +1,2 @@ +[mariadb] +max_connections = 1024 diff --git a/.docker/config/mariadb/finetuning.cnf b/.docker/config/mariadb/finetuning.cnf new file mode 100644 index 0000000..ea97623 --- /dev/null +++ b/.docker/config/mariadb/finetuning.cnf @@ -0,0 +1,16 @@ +[mariadb] + +skip-name-resolve + +key_buffer_size = 128M +max_allowed_packet = 512M +max_heap_table_size = 512M +tmp_table_size = 256M + +innodb_buffer_pool_size = 4G + +join_buffer_size = 32M +join_buffer_space_limit = 256M +join_cache_level = 12 + +query_cache_size = 256M diff --git a/.docker/config/mariadb/json.cnf b/.docker/config/mariadb/json.cnf new file mode 100644 index 0000000..a452aff --- /dev/null +++ b/.docker/config/mariadb/json.cnf @@ -0,0 +1,3 @@ +[mariadb] +plugin-maturity=alpha +plugin-load-add=type_mysql_json diff --git a/.docker/config/mariadb/logs.cnf b/.docker/config/mariadb/logs.cnf new file mode 100644 index 0000000..2a54d17 --- /dev/null +++ b/.docker/config/mariadb/logs.cnf @@ -0,0 +1,8 @@ +[mariadb] +skip-log-error + +general_log = 0 +general_log_file = /var/log/mysql/queries.log + +slow_query_log = 0 +slow_query_log_file = /var/log/mysql/slow_queries.log diff --git a/.docker/config/mariadb/sql_mode.cnf b/.docker/config/mariadb/sql_mode.cnf new file mode 100644 index 0000000..6063953 --- /dev/null +++ b/.docker/config/mariadb/sql_mode.cnf @@ -0,0 +1,2 @@ +[mariadb] +sql_mode = ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION diff --git a/.docker/config/passwords b/.docker/config/passwords new file mode 100644 index 0000000..f0bd6d7 --- /dev/null +++ b/.docker/config/passwords @@ -0,0 +1 @@ +bloomsburie:7JRrMfCW7vPwYEWJ diff --git a/.docker/config/php.ini b/.docker/config/php.ini new file mode 100644 index 0000000..dba8bcf --- /dev/null +++ b/.docker/config/php.ini @@ -0,0 +1,7 @@ +upload_max_filesize = 8G +post_max_size = 8G +max_file_uploads = 1000 +error_log = /proc/self/fd/2 +log_errors = 1 +memory_limit = 12G +max_input_vars = 1000000 diff --git a/.docker/config/rsyslog/50-default.conf b/.docker/config/rsyslog/50-default.conf new file mode 100644 index 0000000..f939a48 --- /dev/null +++ b/.docker/config/rsyslog/50-default.conf @@ -0,0 +1,48 @@ +# Default rules for rsyslog. +# +# For more information see rsyslog.conf(5) and /etc/rsyslog.conf + +# +# First some standard log files. Log by facility. +# +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +#daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +#lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +#user.* -/var/log/user.log + +# +# Logging for the mail system. Split it up so that +# it is easy to write scripts to parse these files. +# +#mail.info -/var/log/mail.info +#mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +# +# Some "catch-all" log files. +# +#*.=debug;\ +# auth,authpriv.none;\ +# news.none;mail.none -/var/log/debug +#*.=info;*.=notice;*.=warn;\ +# auth,authpriv.none;\ +# cron,daemon.none;\ +# mail,news.none -/var/log/messages + +# +# Emergencies are sent to everybody logged in. +# +*.emerg :omusrmsg:* + +# +# I like to have messages displayed on the console, but only on a virtual +# console I usually leave idle. +# +#daemon,mail.*;\ +# news.=crit;news.=err;news.=notice;\ +# *.=debug;*.=info;\ +# *.=notice;*.=warn /dev/tty8 diff --git a/.docker/config/rsyslog/init.d b/.docker/config/rsyslog/init.d new file mode 100644 index 0000000..96ddd14 --- /dev/null +++ b/.docker/config/rsyslog/init.d @@ -0,0 +1,137 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: rsyslog +# Required-Start: $remote_fs $time +# Required-Stop: umountnfs $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: enhanced syslogd +# Description: Rsyslog is an enhanced multi-threaded syslogd. +# It is quite compatible to stock sysklogd and can be +# used as a drop-in replacement. +### END INIT INFO + +# +# Author: Michael Biebl +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="enhanced syslogd" +NAME=rsyslog + +RSYSLOGD=rsyslogd +RSYSLOGD_BIN=/usr/sbin/rsyslogd +RSYSLOGD_OPTIONS="-c5" +RSYSLOGD_PIDFILE=/var/run/rsyslogd.pid + +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$RSYSLOGD_BIN" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + DAEMON="$RSYSLOGD_BIN" + DAEMON_ARGS="$RSYSLOGD_OPTIONS" + PIDFILE="$RSYSLOGD_PIDFILE" + + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS +} + +do_stop() +{ + DAEMON="$RSYSLOGD_BIN" + PIDFILE="$RSYSLOGD_PIDFILE" + + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +# +# Tell rsyslogd to close all open files +# +do_rotate() { + DAEMON="$RSYSLOGD_BIN" + PIDFILE="$RSYSLOGD_PIDFILE" + + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --exec $DAEMON +} + +create_xconsole() { + XCONSOLE=/dev/xconsole + if [ "$(uname -s)" != "Linux" ]; then + XCONSOLE=/run/xconsole + ln -sf $XCONSOLE /dev/xconsole + fi + if [ ! -e $XCONSOLE ]; then + mknod -m 640 $XCONSOLE p + chown root:adm $XCONSOLE + [ -x /sbin/restorecon ] && /sbin/restorecon $XCONSOLE + fi +} + +sendsigs_omit() { + OMITDIR=/run/sendsigs.omit.d + mkdir -p $OMITDIR + ln -sf $RSYSLOGD_PIDFILE $OMITDIR/rsyslog +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$RSYSLOGD" + create_xconsole + do_start + case "$?" in + 0) sendsigs_omit + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$RSYSLOGD" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + rotate) + log_daemon_msg "Closing open files" "$RSYSLOGD" + do_rotate + log_end_msg $? + ;; + restart|force-reload) + $0 stop + $0 start + ;; + status) + status_of_proc -p $RSYSLOGD_PIDFILE $RSYSLOGD_BIN $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|status}" >&2 + exit 3 + ;; +esac + +: \ No newline at end of file diff --git a/.docker/config/rsyslog/rsyslog.conf b/.docker/config/rsyslog/rsyslog.conf new file mode 100644 index 0000000..94bc18f --- /dev/null +++ b/.docker/config/rsyslog/rsyslog.conf @@ -0,0 +1,60 @@ +# /etc/rsyslog.conf configuration file for rsyslog +# +# For more information install rsyslog-doc and see +# /usr/share/doc/rsyslog-doc/html/configuration/index.html +# +# Default logging rules can be found in /etc/rsyslog.d/50-default.conf + + +################# +#### MODULES #### +################# + +module(load="imuxsock") # provides support for local system logging +#module(load="immark") # provides --MARK-- message capability + +# provides UDP syslog reception +#module(load="imudp") +#input(type="imudp" port="514") + +# provides TCP syslog reception +#module(load="imtcp") +#input(type="imtcp" port="514") + +# provides kernel logging support and enable non-kernel klog messages +# module(load="imklog" permitnonkernelfacility="on") + + +########################### +#### GLOBAL DIRECTIVES #### +########################### + +# +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +# +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# Filter duplicated messages +$RepeatedMsgReduction on + +# +# Set the default permissions for all log files. +# +$FileOwner syslog +$FileGroup adm +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 +$PrivDropToUser syslog +$PrivDropToGroup syslog + +# +# Where to place spool and state files +# +$WorkDirectory /var/spool/rsyslog + +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf \ No newline at end of file diff --git a/.docker/config/ssh/root/authorized_keys2 b/.docker/config/ssh/root/authorized_keys2 new file mode 100644 index 0000000..c5de45b --- /dev/null +++ b/.docker/config/ssh/root/authorized_keys2 @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAtabxRZZMjtmq+r8uXsBmfLgAtkxqwigGpx0e6Mx066ukIWIafFsguity6aV5QNI4UfxXnX3QXROcWeIiyLBV4yDGxuq7ah4r0X1CjqHUvHoGpXwJ2DIWPeaa8XyXnavmj0SNtKn0f1T+oJS0fcryUTLyxY7eOgNsr+pp1fVmgca9Efj0BKUXV/SUIjp8JX3x0/E/3PAqG81zus2SxzuOO1b0FKXDq43Gx6Ov3Ok7+Pje4G4pB56rJiiXlPxrBlY0e8Pz/7+kFF8izCiztJLtZig32Dx0HbLYGtSvIPJKYxK8DDD/RWWpL3mgNPYZ2PE3wHf4c7CTlxLCDP+NeRS1yQ== vincent+2021@cubedesigners.com +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYAQ/tdQpfweVSyxgvF7hFtl4ax+0g8uI102LeH4NmZtzh85DmD3ccoN5UvAf3SOU6nTGLBN2i/YGRruYmm3PDDYBwyKmq3d1ZqUd8ItNfmTlVbRQme0qE6uOVfHgiejDqm9SS0kbI0lYi/BHp7sWK0UM18iE6NbsSgxw468FwBhtSiR78dw1yEhZQdtQDxusD6LbsGDsj37bV9YHFPVslzc6Bkf4fg9igm5YStCdmcYG86t0RUZDfHw6YGuIxXWkDRh1fpC6yj3Wv+n4+Zho5Bjlryg+YRhxFzno2VxgIeScIAernhUq3yy2whZU3jrWfXKfxutPmpCowl17ydcMXUr8Zt44RaYSVJI6V2lbw/B3HWW8BjkVmHlzDhulw4sJzWYoQOhiDLrUFprdF49CtYFrfsuVOx1IwETfnKKI0w5JqID+sa1iYCtgP9BdfO/H04iW3pFeaNhKW89c7GNZHhNuAS9x5wmcDpYiu2DH/ZIZIQ2wGKcyiZ0sMXQqBS4U= 33610@AYOR diff --git a/.docker/config/ssh/server/moduli b/.docker/config/ssh/server/moduli new file mode 100644 index 0000000..e69de29 diff --git a/.docker/config/ssh/server/ssh_config b/.docker/config/ssh/server/ssh_config new file mode 100644 index 0000000..e69de29 diff --git a/.docker/config/ssh/server/ssh_host_dsa_key b/.docker/config/ssh/server/ssh_host_dsa_key new file mode 100644 index 0000000..237689f --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_dsa_key @@ -0,0 +1,21 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABsQAAAAdzc2gtZH +NzAAAAgQDPTWZ5HOqyYbdmIdmVWHYAUI4c86H7dmQCvDMvUEoJN3COSFpHep97WOhGsftc +vET+2du89plW5I2Ow4kxpZB8ZVZyztKzD1KtsB7v1cJNEl9WyL6TTP08UBkfK2r9THe+FU +JkVI6psGwEyan1SZ2OqtMAHZyhIc0G2GSh5PlAbwAAABUAinQOI7wd+kW75Hut02RkLi9X +PQEAAACAY5a2PrQGRTOPgyit4VvhmeN7R20v/ZXWh1rf2Kn5ebZMIcZUyJijq3wC2/Sdv1 +K02GLWsaKjkajn2+rx0TvgQVkO3WA5O5fiL5DyTNvyNnxktlFGD/CfzgqHwgDvdTQXR8TH +AoJA1JsJOMZZwmWZ6B0Dsj4n4W/2ZyMcdVtGrV4AAACAOQAA5dmtiTFOTxn6yi2isPb3aa +AAkjNUfdt4Ra8ygg95PPBhhqOc8EJaJ16CVRxz4+f2K/bnzG8s/PG4T4P1gzIw9SOHvocA +PgEbRU23g5FZMxD0+1CG3Bt/zVcgD7RobxCsF7IbAMUh4y+t7sPacJolTYxLGRFmp2z+Wq +k/zVYAAAHouJVFXLiVRVwAAAAHc3NoLWRzcwAAAIEAz01meRzqsmG3ZiHZlVh2AFCOHPOh ++3ZkArwzL1BKCTdwjkhaR3qfe1joRrH7XLxE/tnbvPaZVuSNjsOJMaWQfGVWcs7Ssw9Srb +Ae79XCTRJfVsi+k0z9PFAZHytq/Ux3vhVCZFSOqbBsBMmp9UmdjqrTAB2coSHNBthkoeT5 +QG8AAAAVAIp0DiO8HfpFu+R7rdNkZC4vVz0BAAAAgGOWtj60BkUzj4MoreFb4Znje0dtL/ +2V1oda39ip+Xm2TCHGVMiYo6t8Atv0nb9StNhi1rGio5Go59vq8dE74EFZDt1gOTuX4i+Q +8kzb8jZ8ZLZRRg/wn84Kh8IA73U0F0fExwKCQNSbCTjGWcJlmegdA7I+J+Fv9mcjHHVbRq +1eAAAAgDkAAOXZrYkxTk8Z+sotorD292mgAJIzVH3beEWvMoIPeTzwYYajnPBCWideglUc +c+Pn9iv258xvLPzxuE+D9YMyMPUjh76HAD4BG0VNt4ORWTMQ9PtQhtwbf81XIA+0aG8QrB +eyGwDFIeMvre7D2nCaJU2MSxkRZqds/lqpP81WAAAAFB2AupVpKEnWd0XLrlClK3P+iMMI +AAAAEHJvb3RAYmxvb21zYnVyaWUBAgM= +-----END OPENSSH PRIVATE KEY----- diff --git a/.docker/config/ssh/server/ssh_host_dsa_key.pub b/.docker/config/ssh/server/ssh_host_dsa_key.pub new file mode 100644 index 0000000..edc3305 --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_dsa_key.pub @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAM9NZnkc6rJht2Yh2ZVYdgBQjhzzoft2ZAK8My9QSgk3cI5IWkd6n3tY6Eax+1y8RP7Z27z2mVbkjY7DiTGlkHxlVnLO0rMPUq2wHu/Vwk0SX1bIvpNM/TxQGR8rav1Md74VQmRUjqmwbATJqfVJnY6q0wAdnKEhzQbYZKHk+UBvAAAAFQCKdA4jvB36Rbvke63TZGQuL1c9AQAAAIBjlrY+tAZFM4+DKK3hW+GZ43tHbS/9ldaHWt/Yqfl5tkwhxlTImKOrfALb9J2/UrTYYtaxoqORqOfb6vHRO+BBWQ7dYDk7l+IvkPJM2/I2fGS2UUYP8J/OCofCAO91NBdHxMcCgkDUmwk4xlnCZZnoHQOyPifhb/ZnIxx1W0atXgAAAIA5AADl2a2JMU5PGfrKLaKw9vdpoACSM1R923hFrzKCD3k88GGGo5zwQlonXoJVHHPj5/Yr9ufMbyz88bhPg/WDMjD1I4e+hwA+ARtFTbeDkVkzEPT7UIbcG3/NVyAPtGhvEKwXshsAxSHjL63uw9pwmiVNjEsZEWanbP5aqT/NVg== root@bloomsburie diff --git a/.docker/config/ssh/server/ssh_host_ecdsa_key b/.docker/config/ssh/server/ssh_host_ecdsa_key new file mode 100644 index 0000000..73cba6a --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_ecdsa_key @@ -0,0 +1,9 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS +1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQRisIzGdcCpqYXrAaDgmYh6QPdDTCf+ +VrxDI7IKdQ+ITtnUh5EU4Cclf5TapotgJOc04c20CDy+6atAQCSapAFhAAAAsPf6y4T3+s +uEAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGKwjMZ1wKmphesB +oOCZiHpA90NMJ/5WvEMjsgp1D4hO2dSHkRTgJyV/lNqmi2Ak5zThzbQIPL7pq0BAJJqkAW +EAAAAhAOTqblM8VMJRyw4XRYGRieDYk9AQqZ9kEpkUjuARSuEoAAAAEHJvb3RAYmxvb21z +YnVyaWUBAgMEBQYH +-----END OPENSSH PRIVATE KEY----- diff --git a/.docker/config/ssh/server/ssh_host_ecdsa_key.pub b/.docker/config/ssh/server/ssh_host_ecdsa_key.pub new file mode 100644 index 0000000..913386b --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_ecdsa_key.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGKwjMZ1wKmphesBoOCZiHpA90NMJ/5WvEMjsgp1D4hO2dSHkRTgJyV/lNqmi2Ak5zThzbQIPL7pq0BAJJqkAWE= root@bloomsburie diff --git a/.docker/config/ssh/server/ssh_host_ed25519_key b/.docker/config/ssh/server/ssh_host_ed25519_key new file mode 100644 index 0000000..bf7a3ba --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_ed25519_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBwSbEaKvILaNgMgK8c91BPqSlTAsQtDuzFvjgvz894owAAAJisyT3nrMk9 +5wAAAAtzc2gtZWQyNTUxOQAAACBwSbEaKvILaNgMgK8c91BPqSlTAsQtDuzFvjgvz894ow +AAAEAyJ4dvBCbaodUxRUB+hFfU3IM/qSHtHNYYZpY8DTPK73BJsRoq8gto2AyArxz3UE+p +KVMCxC0O7MW+OC/Pz3ijAAAAEHJvb3RAYmxvb21zYnVyaWUBAgMEBQ== +-----END OPENSSH PRIVATE KEY----- diff --git a/.docker/config/ssh/server/ssh_host_ed25519_key.pub b/.docker/config/ssh/server/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..546f19b --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHBJsRoq8gto2AyArxz3UE+pKVMCxC0O7MW+OC/Pz3ij root@bloomsburie diff --git a/.docker/config/ssh/server/ssh_host_rsa_key b/.docker/config/ssh/server/ssh_host_rsa_key new file mode 100644 index 0000000..0b09272 --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_rsa_key @@ -0,0 +1,38 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn +NhAAAAAwEAAQAAAYEAx3cyDhJ77VHmY56QndpZgBvXKImJZB8EGqN6zeIvpdbUNFOKLtsV +ALVQe4Eo0BAmBXKDoFbxKT6acgX99WYOJodOWkKX5BtzmmKsUbQD0hAA/7QCcfWd86LOeD +7Ij0iCbWH4W5Sl/YsEuRTJG5NRLLhsMW5Q6Ak0ZPcvmApyDAjp+wlYH+Hg0T8JV9dPTF4a +TDt38B+f5dCiQwb9Pyt5y0HZ9MEtVpuSPH9qeQDpOowVoQ9jsicG2+SS46wIXoZE84+zzB +8+qZ4Hs9wAkGpO7nzHDwEElAtELO+v7EjPEOQYmXbbmYikh0CeM1BSM/wMMDPwIKmsSuAA +ElH1c2YzeNJBGvCk2uPO2zkeg+UoVUp6eqVqcLRPe2LA9LVaWPDl+WfaG/GgDuBPVoqBnr +xCmz48eDrT1CSpVqrCA775kqt6xzdsufmRuOIeaNmwr2IYztOoAKvw4uDQNgmyqZTxzlVC +xthgS933gIU1GLeVZ6mMmzjJn+lKDXDKhsqoqNMvAAAFiJ6JBsueiQbLAAAAB3NzaC1yc2 +EAAAGBAMd3Mg4Se+1R5mOekJ3aWYAb1yiJiWQfBBqjes3iL6XW1DRTii7bFQC1UHuBKNAQ +JgVyg6BW8Sk+mnIF/fVmDiaHTlpCl+Qbc5pirFG0A9IQAP+0AnH1nfOizng+yI9Igm1h+F +uUpf2LBLkUyRuTUSy4bDFuUOgJNGT3L5gKcgwI6fsJWB/h4NE/CVfXT0xeGkw7d/Afn+XQ +okMG/T8rectB2fTBLVabkjx/ankA6TqMFaEPY7InBtvkkuOsCF6GRPOPs8wfPqmeB7PcAJ +BqTu58xw8BBJQLRCzvr+xIzxDkGJl225mIpIdAnjNQUjP8DDAz8CCprErgABJR9XNmM3jS +QRrwpNrjzts5HoPlKFVKenqlanC0T3tiwPS1Wljw5fln2hvxoA7gT1aKgZ68Qps+PHg609 +QkqVaqwgO++ZKresc3bLn5kbjiHmjZsK9iGM7TqACr8OLg0DYJsqmU8c5VQsbYYEvd94CF +NRi3lWepjJs4yZ/pSg1wyobKqKjTLwAAAAMBAAEAAAGARGXaMzshZdLExvpTqt15/VUOpa +bsBvofxSaz8K+UGTEemUbgRor3m8OQ8pjqrtYqw4luG2hU0AjYmyr019aEGbAiLQ9S2HSV +YqZdYrLw8HJudUB76ioIXMhCNreIvKFnoCyNJpJFjTjDiNfY0mzk1An1h8nFUpv9bHXayy +8hxoC0A1JD9sLU/cu433dEiPJn4CYwTZX6larCSWu3IZc973YIUEaBzoYQUlB66T1nvJzW +ueD2FdwOHQ83U3zlbcxqcvveFUWTtC69S6YCuW9sBr80K/T0QKHRR0d02kFnhyedrHMOnx +oi72tIo8vEzvcr+k/m1z1Kk5PyWWtW2BACoTxG/10xy/bv9ggyi9tWfo9gyiRLlQJSNzlh +4YBdWReY31vKXAeprbR2MIF2xx+vE9tgocIT42XsiU1f81aCpN8CP/YbIIbUYS5EyIKJgo +cAPwxpDVIq04wtFMfMNYsVEnZ5TjaJwtBujYZE8rIMYGxrtetu/h3qItfxY5E+gJBpAAAA +wHrzyZW/d8w2B4qqgSUrypLzqtSTIKzYMy6KPucDE3n3ZfDyPjKpQEcbOarAmFYKOqcVZM +c5CZOM6veQCsC9rltiWM/Rko+ysC/oYoe5GH3ClPvhS3sDPU1wnuX+jcZ7KcxC42EC8UmT +FP3KG0okupvDYF6B09EKI1tcM5WGZOxeuzrLPg5G/4urmFuPAFa7c4n1RCNVFxFgRahAWV +cA6WUz+shLB81q7lmDK99Nx7copAACZkqLJXn933xlzr5E4AAAAMEA9YkEJNgG7BrjGGn4 +yQol8ND96zhURawrUNBcO+YuhkEOvIRIbkdouqLDEAYGlN/urRkXKw25pq94EYZxpEhc5n +vTX7mLbRlVtYV57SexMuJ5vSu+ao4vzIZ1Jsp0GGpeYnwJJQzN9+IdUKaegpl7kyGxRrm+ +sftaYPi7y8UYGhu9Rq8eH7zF/Ko/MlxvzOHrVCMfIeAf8bh+Sxgpjiv54tfvixWkRaCWQc +CWvJDf4DyuWs+zY8yuCGoS6tdfFmcTAAAAwQDP94X7X6zqWvinkubgDyljPvbRUd+emcOa +67X0dSbudV9GgPeYGlTU084jqVa4RhT/SM9sVE8hSNR+FOgvl6aCIO6G8AyOAkrLuvMcBX +d6MLGEoYimbX0WMmoMy6pxFn7C/LOcV8xA0hyYl9t+ZKnOdEZr8hb5MymsR05rwaFGmkDP +x1inaA/Gtro9HY29/DusJM5WobYyugVVYvXYj8t8rcC4X54m6IJn+/yueixktNllHLJh68 +hnSbgU8W4G2vUAAAAQcm9vdEBibG9vbXNidXJpZQECAw== +-----END OPENSSH PRIVATE KEY----- diff --git a/.docker/config/ssh/server/ssh_host_rsa_key.pub b/.docker/config/ssh/server/ssh_host_rsa_key.pub new file mode 100644 index 0000000..e79e1a1 --- /dev/null +++ b/.docker/config/ssh/server/ssh_host_rsa_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHdzIOEnvtUeZjnpCd2lmAG9coiYlkHwQao3rN4i+l1tQ0U4ou2xUAtVB7gSjQECYFcoOgVvEpPppyBf31Zg4mh05aQpfkG3OaYqxRtAPSEAD/tAJx9Z3zos54PsiPSIJtYfhblKX9iwS5FMkbk1EsuGwxblDoCTRk9y+YCnIMCOn7CVgf4eDRPwlX109MXhpMO3fwH5/l0KJDBv0/K3nLQdn0wS1Wm5I8f2p5AOk6jBWhD2OyJwbb5JLjrAhehkTzj7PMHz6pngez3ACQak7ufMcPAQSUC0Qs76/sSM8Q5BiZdtuZiKSHQJ4zUFIz/AwwM/AgqaxK4AASUfVzZjN40kEa8KTa487bOR6D5ShVSnp6pWpwtE97YsD0tVpY8OX5Z9ob8aAO4E9WioGevEKbPjx4OtPUJKlWqsIDvvmSq3rHN2y5+ZG44h5o2bCvYhjO06gAq/Di4NA2CbKplPHOVULG2GBL3feAhTUYt5VnqYybOMmf6UoNcMqGyqio0y8= root@bloomsburie diff --git a/.docker/config/ssh/server/sshd_config b/.docker/config/ssh/server/sshd_config new file mode 100644 index 0000000..f9386d2 --- /dev/null +++ b/.docker/config/ssh/server/sshd_config @@ -0,0 +1,115 @@ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +Include /etc/ssh/sshd_config.d/*.conf + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key + +# Ciphers and keying +#RekeyLimit default none + +# Logging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin prohibit-password +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#PubkeyAuthentication yes + +# Expect .ssh/authorized_keys2 to be disregarded by default in future. +#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to yes to enable challenge-response passwords (beware issues with +# some PAM modules and threads) +KbdInteractiveAuthentication no + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes +#GSSAPIStrictAcceptorCheck yes +#GSSAPIKeyExchange no + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the KbdInteractiveAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via KbdInteractiveAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and KbdInteractiveAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +X11Forwarding yes +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PermitTTY yes +PrintMotd no +#PrintLastLog yes +#TCPKeepAlive yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS no +#PidFile /run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# Allow client to pass locale environment variables +AcceptEnv LANG LC_* + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server diff --git a/.docker/config/ssh/user/authorized_keys2 b/.docker/config/ssh/user/authorized_keys2 new file mode 100644 index 0000000..c5de45b --- /dev/null +++ b/.docker/config/ssh/user/authorized_keys2 @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAtabxRZZMjtmq+r8uXsBmfLgAtkxqwigGpx0e6Mx066ukIWIafFsguity6aV5QNI4UfxXnX3QXROcWeIiyLBV4yDGxuq7ah4r0X1CjqHUvHoGpXwJ2DIWPeaa8XyXnavmj0SNtKn0f1T+oJS0fcryUTLyxY7eOgNsr+pp1fVmgca9Efj0BKUXV/SUIjp8JX3x0/E/3PAqG81zus2SxzuOO1b0FKXDq43Gx6Ov3Ok7+Pje4G4pB56rJiiXlPxrBlY0e8Pz/7+kFF8izCiztJLtZig32Dx0HbLYGtSvIPJKYxK8DDD/RWWpL3mgNPYZ2PE3wHf4c7CTlxLCDP+NeRS1yQ== vincent+2021@cubedesigners.com +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYAQ/tdQpfweVSyxgvF7hFtl4ax+0g8uI102LeH4NmZtzh85DmD3ccoN5UvAf3SOU6nTGLBN2i/YGRruYmm3PDDYBwyKmq3d1ZqUd8ItNfmTlVbRQme0qE6uOVfHgiejDqm9SS0kbI0lYi/BHp7sWK0UM18iE6NbsSgxw468FwBhtSiR78dw1yEhZQdtQDxusD6LbsGDsj37bV9YHFPVslzc6Bkf4fg9igm5YStCdmcYG86t0RUZDfHw6YGuIxXWkDRh1fpC6yj3Wv+n4+Zho5Bjlryg+YRhxFzno2VxgIeScIAernhUq3yy2whZU3jrWfXKfxutPmpCowl17ydcMXUr8Zt44RaYSVJI6V2lbw/B3HWW8BjkVmHlzDhulw4sJzWYoQOhiDLrUFprdF49CtYFrfsuVOx1IwETfnKKI0w5JqID+sa1iYCtgP9BdfO/H04iW3pFeaNhKW89c7GNZHhNuAS9x5wmcDpYiu2DH/ZIZIQ2wGKcyiZ0sMXQqBS4U= 33610@AYOR diff --git a/.docker/config/sudoers b/.docker/config/sudoers new file mode 100644 index 0000000..c0a2c9d --- /dev/null +++ b/.docker/config/sudoers @@ -0,0 +1 @@ +bloomsburie ALL=(ALL) NOPASSWD:ALL diff --git a/.docker/images/elasticsearch/Dockerfile b/.docker/images/elasticsearch/Dockerfile new file mode 100644 index 0000000..3d66109 --- /dev/null +++ b/.docker/images/elasticsearch/Dockerfile @@ -0,0 +1,2 @@ +FROM docker.elastic.co/elasticsearch/elasticsearch:8.10.2 +RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-icu diff --git a/.docker/images/httpd/Dockerfile b/.docker/images/httpd/Dockerfile new file mode 100644 index 0000000..aab8bc2 --- /dev/null +++ b/.docker/images/httpd/Dockerfile @@ -0,0 +1,3 @@ +FROM httpd +RUN apt-get update && apt-get install -y --no-install-recommends nano less bash libapache2-mod-xsendfile +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/.docker/images/php-5.6-fpm/Dockerfile b/.docker/images/php-5.6-fpm/Dockerfile new file mode 100644 index 0000000..67be083 --- /dev/null +++ b/.docker/images/php-5.6-fpm/Dockerfile @@ -0,0 +1,82 @@ +FROM ubuntu:jammy AS cli + +WORKDIR "/application" + +# Fixes some weird terminal issues such as broken clear / CTRL+L +ENV TERM=linux + +# Install Ondrej repos for Ubuntu Bionic, PHP7.2, composer and selected extensions - better selection than +# the distro's packages +RUN apt-get update \ + && apt-get install -y --no-install-recommends gnupg \ + && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \ + && apt-get update \ + && apt-get update \ + && apt-get -y --no-install-recommends install \ + curl \ + ca-certificates \ + unzip \ + php5.6-cli \ + php5.6-curl \ + php5.6-json \ + php5.6-mbstring \ + php5.6-opcache \ + php5.6-readline \ + php5.6-xml \ + php5.6-zip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* + +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer + +CMD ["php", "-a"] + +# If you'd like to be able to use this container on a docker-compose environment as a quiescent PHP CLI container +# you can /bin/bash into, override CMD with the following - bear in mind that this will make docker-compose stop +# slow on such a container, docker-compose kill might do if you're in a hurry +# CMD ["tail", "-f", "/dev/null"] + +FROM cli AS fpm + +# Install FPM +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + && apt-get -y --no-install-recommends install php5.6-fpm \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* + +# PHP-FPM packages need a nudge to make them docker-friendly +COPY overrides.conf /etc/php/5.6/fpm/pool.d/z-overrides.conf + +# PHP-FPM has really dirty logs, certainly not good for dockerising +# The following startup script contains some magic to clean these up +COPY --chmod=755 php-fpm-startup /usr/bin/php-fpm +CMD /usr/bin/php-fpm + +# Open up fcgi port +EXPOSE 9000 + +RUN apt-get update; \ + apt-get -y --no-install-recommends install \ + git \ + php5.6-bz2 \ + php5.6-gd \ + php5.6-igbinary \ + php5.6-imap \ + php5.6-imagick \ + php5.6-intl \ + php5.6-memcached \ + php5.6-mysql \ + php5.6-redis \ + php5.6-soap \ + php5.6-ssh2 \ + php5.6-tidy \ + php5.6-xsl \ + php5.6-curl \ + php5.6-json \ + php5.6-mcrypt \ + less nano wget curl \ + sudo openssh-server rsyslog cron mariadb-client; \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; diff --git a/.docker/images/php-5.6-fpm/overrides.conf b/.docker/images/php-5.6-fpm/overrides.conf new file mode 100644 index 0000000..51c835c --- /dev/null +++ b/.docker/images/php-5.6-fpm/overrides.conf @@ -0,0 +1,17 @@ +[global] +; Override default pid file +pid = /run/php-fpm.pid + +; Avoid logs being sent to syslog +error_log = /proc/self/fd/2 + +[www] +; Access from webserver container is via network, not socket file +listen = [::]:9000 + +; Redirect logs to stdout - FPM closes /dev/std* on startup +access.log = /proc/self/fd/2 +catch_workers_output = yes + +; Required to allow config-by-environment +clear_env = no diff --git a/.docker/images/php-5.6-fpm/php-fpm-startup b/.docker/images/php-5.6-fpm/php-fpm-startup new file mode 100644 index 0000000..6ff2998 --- /dev/null +++ b/.docker/images/php-5.6-fpm/php-fpm-startup @@ -0,0 +1,33 @@ +#!/bin/sh + +# Set file rights +umask 0000 +chmod -R 777 /tmp + +chown -R root:root /etc/sudoers.d +chown -R bloomsburie:www-data /application + +# Rsyslog +start-stop-daemon --start -b -x /usr/sbin/rsyslogd -- -n + +# SSH Server +ssh-keygen -A +chmod 755 /etc/ssh/*.d +chmod 600 /etc/ssh/*_key +chmod 750 /application +#chmod 600 /application/.ssh/id_rsa +chmod 700 /application/.ssh/ +chmod 600 /application/.ssh/authorized_keys2 +#chmod 600 /root/.ssh/id_rsa +chmod 700 /root/.ssh/ +chmod 600 /root/.ssh/authorized_keys2 +/usr/sbin/service ssh start + +# Cron +chmod 0644 /etc/crontab && crontab -u root /etc/crontab && /usr/sbin/service cron start + +# Set user password +chpasswd < /root/passwords + +# Launch PHP +/usr/sbin/php-fpm5.6 -F -O 2>&1 | sed -u 's,.*: \"\(.*\)$,\1,'| sed -u 's,"$,,' 1>&1 diff --git a/.docker/images/php-fpm/Dockerfile b/.docker/images/php-fpm/Dockerfile new file mode 100644 index 0000000..123d9b7 --- /dev/null +++ b/.docker/images/php-fpm/Dockerfile @@ -0,0 +1,79 @@ +############################################ +# PHPDocker.io PHP 7.4 / CLI and FPM image # +############################################ + +FROM ubuntu:jammy AS cli + +WORKDIR "/application" + +# Fixes some weird terminal issues such as broken clear / CTRL+L +ENV TERM=linux + +# Ensure apt doesn't ask questions when installing stuff +ENV DEBIAN_FRONTEND=noninteractive + +# Add Ondrej PHP repository +RUN apt update \ + && apt install -y --no-install-recommends ca-certificates gnupg bash curl \ + && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C + +# Add Nodejs Repository +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list + +RUN apt update + +RUN apt -y --no-install-recommends install \ + git \ + php7.4-apcu \ + php7.4-cli \ + php7.4-curl \ + php7.4-mbstring \ + php7.4-opcache \ + php7.4-readline \ + php7.4-xml \ + php7.4-zip \ + php7.4-bz2 \ + php7.4-gd \ + php7.4-igbinary \ + php7.4-imap \ + php7.4-imagick \ + php7.4-intl \ + php7.4-memcached \ + php7.4-mysql \ + php7.4-redis \ + php7.4-soap \ + php7.4-ssh2 \ + php7.4-tidy \ + php7.4-xsl \ + php7.4-curl \ + php7.4-bcmath \ + php7.4-fpm \ + less nano wget nodejs sudo openssh-server rsyslog cron mariadb-client zip unzip imagemagick locales postfix + +RUN sed -i '/fr_FR.UTF-8/s/^# //g' /etc/locale.gen && \ + locale-gen +ENV LANG fr_FR.UTF-8 +ENV LANGUAGE fr_FR:$localshort +ENV LC_ALL fr_FR.UTF-8 + +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer + +# IF you need some npm globally installed packages +RUN npm install --unsafe-perm --global yarn + +CMD ["php", "-a"] + +STOPSIGNAL SIGQUIT + +RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 bloomsburie + +# PHP-FPM packages need a nudge to make them docker-friendly +COPY overrides.conf /etc/php/7.4/fpm/pool.d/z-overrides.conf + +COPY --chmod=755 startup /usr/bin/startup +CMD exec /usr/bin/startup + +# Open up fcgi port +EXPOSE 9000 diff --git a/.docker/images/php-fpm/overrides.conf b/.docker/images/php-fpm/overrides.conf new file mode 100644 index 0000000..b799bf1 --- /dev/null +++ b/.docker/images/php-fpm/overrides.conf @@ -0,0 +1,37 @@ +[global] +; Override default pid file +pid = /run/php-fpm.pid + +; Avoid logs being sent to syslog +error_log = /proc/self/fd/2 + +; Set this to php default's max_execution_time to allow children to stop gracefully when fpm is commanded to stop +; This helps avoiding 502's +process_control_timeout = 30 + +; Do not daemonize (eg send process to the background) +daemonize = no + +[www] +; Access from webserver container is via network, not socket file +listen = [::]:9000 + +; Redirect logs to stdout - FPM closes /dev/std* on startup +access.log = /proc/self/fd/1 +catch_workers_output = yes + +; Remove "pool www" decoration from log output (older phpdocker.io containers for php use sed for this) +decorate_workers_output = no + +; Required to allow config-by-environment +clear_env = no + +user = 1001 +group = 33 + +pm = dynamic +pm.max_children = 16 +pm.start_servers = 4 +pm.min_spare_servers = 4 +pm.max_spare_servers = 8 +pm.max_requests = 500 diff --git a/.docker/images/php-fpm/startup b/.docker/images/php-fpm/startup new file mode 100644 index 0000000..e367045 --- /dev/null +++ b/.docker/images/php-fpm/startup @@ -0,0 +1,33 @@ +#!/bin/sh + +# Set file rights +umask 0000 +chmod -R 777 /tmp + +chown -R root:root /etc/sudoers.d +chown -R bloomsburie:www-data /application + +# Rsyslog +start-stop-daemon --start -b -x /usr/sbin/rsyslogd -- -n + +# SSH Server +ssh-keygen -A +chmod 755 /etc/ssh/*.d +chmod 600 /etc/ssh/*_key +chmod 750 /application +#chmod 600 /application/.ssh/id_rsa +chmod 700 /application/.ssh/ +chmod 600 /application/.ssh/authorized_keys2 +#chmod 600 /root/.ssh/id_rsa +chmod 700 /root/.ssh/ +chmod 600 /root/.ssh/authorized_keys2 +/usr/sbin/service ssh start + +# Cron +chmod 0644 /etc/crontab && crontab -u root /etc/crontab && /usr/sbin/service cron start + +# Set user password +chpasswd < /root/passwords + +# Launch PHP +/usr/sbin/php-fpm7.4 -O diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml new file mode 100644 index 0000000..7c9dd88 --- /dev/null +++ b/.docker/production/docker-compose.yml @@ -0,0 +1,105 @@ +version: '3.1' +services: + webserver: + container_name: bloomsburie-httpd + build: './www/.docker/images/httpd' + working_dir: /application + volumes: + - './www/:/usr/local/apache2/htdocs' + - './www/:/application/' + - './www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' + environment: + VIRTUAL_HOST: bloomsburie.dev2.cubedesigners.com + LETSENCRYPT_HOST: bloomsburie.dev2.cubedesigners.com + networks: + - bloomsburie + restart: unless-stopped + php-fpm: + container_name: bloomsburie + hostname: bloomsburie + build: './www/.docker/images/php-fpm' + working_dir: /application + volumes: + # SSH + - './www/.docker/config/ssh/root/:/root/.ssh/' + - './www/.docker/config/ssh/user/:/application/.ssh/' + - './www/.docker/config/ssh/server/:/etc/ssh/' + # Rsyslog + - './www/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf' + - './www/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf' + # Composer + - './www/.docker/config/composer/:/root/.config/composer/' + - './www/.docker/config/composer/:/application/.config/composer/' + # Sudoers + - './www/.docker/config/sudoers:/etc/sudoers.d/bloomsburie' + # ImageMagick + - './www/.docker/config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml' + # Passwords + - './www/.docker/config/passwords:/root/passwords' + # Cron + - './www/.docker/config/cron/crontab:/etc/crontab' + # PHP + - './www/.docker/config/php.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini' + # ENV + - './www/.env.production:/application/.env' + # Web path + - './www:/application' + ports: + - '14680:22' + networks: + - bloomsburie + restart: unless-stopped + + adminer: + image: 'shyim/adminerevo' + container_name: bloomsburie-adminer + restart: unless-stopped + volumes: + - "./www/.docker/config/adminer/php.ini:/etc/php/conf.d/99-adminer.ini" + environment: + ADMINER_DEFAULT_SERVER: bloomsburie-mariadb + VIRTUAL_HOST: adminer.bloomsburie.dev2.cubedesigners.com + LETSENCRYPT_HOST: adminer.bloomsburie.dev2.cubedesigners.com + networks: + - bloomsburie + + mariadb: + container_name: bloomsburie-mariadb + image: 'mariadb:latest' + restart: unless-stopped + environment: + MARIADB_ROOT_PASSWORD: 0b0uezljtKO7RrjR + MARIADB_DATABASE: bloomsburie + MARIADB_AUTO_UPGRADE: 1 + volumes: + - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql" + - "./database/scripts/:/usr/local/bin/scripts/" + - "./database/data:/var/lib/mysql" + - './www/.docker/config/mariadb:/etc/mysql/conf.d:z' + networks: + - bloomsburie + logging: + driver: json-file + options: + max-size: 10M + max-file: 10 + + mysqlbackup: + image: selim13/automysqlbackup + container_name: bloomsburie-automysqlbackup + volumes: + - "./database/backup:/backup" + environment: + USERNAME: root + PASSWORD: 0b0uezljtKO7RrjR + DBHOST: bloomsburie-mariadb + DBEXCLUDE: "performance_schema information_schema" + CRON_SCHEDULE: "0 0 * * *" + EXTRA_OPTS: "--single-transaction" + networks: + - bloomsburie + +networks: + bloomsburie: + external: + name: bloomsburie diff --git a/.docker/production/dockerterminal.bat b/.docker/production/dockerterminal.bat new file mode 100644 index 0000000..3e4b084 --- /dev/null +++ b/.docker/production/dockerterminal.bat @@ -0,0 +1,3 @@ +@echo off +cls +ssh -t root@cloudatlas.cubedesigners.com 'docker exec -it -u bloomsburie bloomsburie /bin/bash' diff --git a/.docker/production/update b/.docker/production/update new file mode 100644 index 0000000..028b40d --- /dev/null +++ b/.docker/production/update @@ -0,0 +1,15 @@ +#!/bin/sh +cd /docker/bloomsburie +docker network create bloomsburie + +chown 0:0 ./config/cron/crontab +chown -R 999:999 ./database/data +chown 0:0 ./config/sudoers + +COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull +COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build + +docker compose down -v +docker compose up -d + +ufw-docker allow bloomsburie diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..030e7b6 --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index ea7be1c..b4f7ccd 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -21,6 +21,8 @@ session.adapter = cache webhost = www.bloomsburie.com +locales.en = + database.adapter = pdo_mysql database.params.host = cubedesigners-v7-mariadb database.params.username = root @@ -55,10 +57,11 @@ database.params.password = 0b0uezljtKO7RrjR database.params.dbname = bloomsburie database.params.username = root -locales.en = bloomsburie.dev2.cubedesigners.com - webhost = bloomsburie.dev2.cubedesigners.com +locales.en = bloomsburie.dev2.cubedesigners.com +locales.fr = fr.bloomsburie.dev2.cubedesigners.com + seo.robots = false httpauth.username=bloomsburie diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php index 2c5feb9..f3d3445 100644 --- a/framework/application/forms/CMS/Home.php +++ b/framework/application/forms/CMS/Home.php @@ -14,20 +14,19 @@ class Cubedesigners_Form_CMS_Home extends Cubedesigners_Form_CMS { $this->addSubForm($slideshow, 'slideshow'); $agence = new Cubedesigners_Form_CMS_Sub_Home_Agence(); - $agence->setLabel("L'agence"); + $agence->setLabel("About us"); $this->addSubForm($agence, 'agence'); - $case_studies = new Cubedesigners_Form_CMS_Sub_Home_CaseStudies(); + $clients = new Cubedesigners_Form_CMS_Sub_Home_Clients(); + $clients->setLabel("Our services"); + $this->addSubForm($clients, 'clients'); + + + $case_studies = new Cubedesigners_Form_CMS_Sub_Home_CaseStudies(); $case_studies->setLabel("Case Studies"); $this->addSubForm($case_studies, 'case_studies'); - $clients = new Cubedesigners_Form_CMS_Sub_Home_Clients(); - $clients->setLabel("Clients"); - $this->addSubForm($clients, 'clients'); - $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises(); - $expertises->setLabel(' Expertises'); - $this->addSubForm($expertises, 'expertises'); } } \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/Contact.php b/framework/application/forms/CMS/Sub/Contact.php index daad21d..bbf976c 100644 --- a/framework/application/forms/CMS/Sub/Contact.php +++ b/framework/application/forms/CMS/Sub/Contact.php @@ -6,11 +6,11 @@ class Cubedesigners_Form_CMS_Sub_Contact extends CubeIT_Form_SubForm { parent::init(); $bloc = new CubeIT_Form_Element_Markitup('bloc'); - $bloc->setLabel('Bloc "Nous Contacter"'); + $bloc->setLabel('"Contact Us" block'); $this->addElement($bloc); $bureaux = new Cubedesigners_Form_CMS_Sub_Contact_Offices('bureaux'); - $bureaux->setLegend('Bureaux'); + $bureaux->setLegend('Office'); $this->addSubForm($bureaux, 'bureaux'); } diff --git a/framework/application/forms/CMS/Sub/Contact/Office.php b/framework/application/forms/CMS/Sub/Contact/Office.php index 78ef353..a926eca 100644 --- a/framework/application/forms/CMS/Sub/Contact/Office.php +++ b/framework/application/forms/CMS/Sub/Contact/Office.php @@ -7,15 +7,15 @@ class Cubedesigners_Form_CMS_Sub_Contact_Office extends CubeIT_Form_SubForm { /* BUREAUX */ $coordonnees = new Cubedesigners_Form_CMS_Sub_MapPoint('coordonnees'); - $coordonnees->setLabel('Coordonnées'); + $coordonnees->setLabel('Address details'); $this->addSubForm($coordonnees, 'coordonnees'); $map = new Cubedesigners_Form_CMS_Sub_MapSettings('map'); - $map->setLegend('Paramètre de la carte'); + $map->setLegend('Map settings'); $this->addSubForm($map, 'map'); $marqueurs = new Cubedesigners_Form_CMS_Sub_ContactMarkers('markers'); - $marqueurs->setLegend("Points d'intérêts"); + $marqueurs->setLegend("Markers"); $this->addSubForm($marqueurs, 'markers'); } diff --git a/framework/application/forms/CMS/Sub/Home/Agence.php b/framework/application/forms/CMS/Sub/Home/Agence.php index d6c9ccb..4451f5d 100644 --- a/framework/application/forms/CMS/Sub/Home/Agence.php +++ b/framework/application/forms/CMS/Sub/Home/Agence.php @@ -6,16 +6,20 @@ class Cubedesigners_Form_CMS_Sub_Home_Agence extends CubeIT_Form_SubForm { parent::init(); $titre = new Zend_Form_Element_Text('titre'); - $titre->setLabel('Titre'); + $titre->setLabel('Title'); $this->addElement($titre); + $text=new Zend_Form_Element_Textarea("text"); + $text->setLabel('Text'); + $this->addElement($text); + $blocs = new Cubedesigners_Form_CMS_Sub_Home_Agence_Blocs('blocs'); - $blocs->setLegend('Blocs'); + $blocs->setLegend('Blocks'); $this->addSubForm($blocs, 'blocs'); $lien = new CubeIT_Form_Element_Link(); $lien->urlEnabled(false)->fileEnabled(false); - $lien->setLegend('Bouton'); + $lien->setLegend('Button'); $this->addSubForm($lien, 'button'); } diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php index afbf94a..bb86335 100644 --- a/framework/application/forms/Settings.php +++ b/framework/application/forms/Settings.php @@ -30,13 +30,9 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings { $logoTitle->setLabel('Titre (logo)'); $this->addElementLocalized($logoTitle); - $baseline = new Zend_Form_Element_Text('baseline'); - $baseline->setLabel('Baseline'); - $this->addElementLocalized($baseline); - /* BLOC CONTACT */ $contact = new Cubedesigners_Form_CMS_Sub_Contact(); - $contact->setLabel('Informations de contact'); + $contact->setLabel('Contact details'); $this->addSubFormLocalized($contact, 'contact'); /* BLOC SUIVEZ-NOUS */ @@ -44,11 +40,6 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings { $followus->setLabel('Bloc Suivez-nous'); $this->addSubFormLocalized($followus, 'followus'); - /* RSS SETTINGS */ - $rss = new Cubedesigners_Form_CMS_Sub_RSS(); - $rss->setLabel('RSS Settings'); - $this->addSubFormLocalized($rss, 'rss'); - /* COPYRIGHT */ $copyright = new Zend_Form_Element_Text('copyright'); $copyright->setLabel('Copyright du bas de page'); @@ -63,16 +54,6 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings { $tags->setLabel(__('Tags')); $this->addElement($tags); - /* ALERT POPUP MESSAGE - used for important notifications */ - $alert_message_enabled = new Zend_Form_Element_Checkbox('alert_message_enabled'); - $alert_message_enabled->setLabel(__("Activer le message d'alerte")); - $alert_message_enabled->setValue(false); - $this->addElement($alert_message_enabled); - - $alert_message = new CubeIT_Form_Element_Markitup('alert_message'); - $alert_message->setLabel(__("Message d'alerte")); - $this->addElementLocalized($alert_message); - } } diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml index 3365a94..d250337 100644 --- a/framework/application/layouts/scripts/layout.phtml +++ b/framework/application/layouts/scripts/layout.phtml @@ -3,7 +3,7 @@ $fonts = [ 'google' => [ 'families' => [ - 'Raleway:300,600,400' + 'Raleway:100,200,300,400,500,600,700,800,900' ] ], ]; diff --git a/framework/application/views/helpers/FooterContact.php b/framework/application/views/helpers/FooterContact.php index 57cdb92..ba8f2fa 100644 --- a/framework/application/views/helpers/FooterContact.php +++ b/framework/application/views/helpers/FooterContact.php @@ -1,46 +1,45 @@ ' . $this->view->markupDotclear($contact['bloc']) . ''; + $res = '
' . $this->view->markupDotclear($contact['bloc']) . '
'; - //fb($contact['bureau']); + //fb($contact['bureau']); - $bureaux = $contact['bureaux']; + $bureaux = $contact['bureaux']; - foreach ($bureaux as $bureau) { + foreach ($bureaux as $bureau) { - $res .= '
'; + $res .= '
'; - $res .= '

' . sprintf(__('Bureaux de %s'), $bureau['coordonnees']['nom']) . '

'; + $res .= '

' . __('Our address') . '
'; - $res .= '
'; - $event = array('category' => 'phone', 'action' => 'call', 'label' => $bureau['coordonnees']['tel']); - $res .= '

' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel'], null, array('data-event' => $event)) . '

'; - //$res.='

' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '

'; - $res .= '
'; + $res .= '
'; + $res .= '

' . $bureau['coordonnees']['adresse'] . '

'; + $res .= '

' . $bureau['coordonnees']['ville'] . ', ' . $bureau['coordonnees']['code_postal'] . '

'; + $res .= '
'; - //$res.= $this->view->microdataPlace($bureau['coordonnees']['adresse']); + $res .= '
' . __('Call us') . '
'; + $res .= '
'; + $event = array('category' => 'phone', 'action' => 'call', 'label' => $bureau['coordonnees']['tel']); + $phone=trim(explode('/',$bureau['coordonnees']['tel'])[1]); + $res .= '

' .$this->view->linkPhone($bureau['coordonnees']['tel'], '+1'.$phone, array('data-event' => $event)) . '

'; + $res .= '
'; - $res .= '
'; - $res .= '

' . __('Cubedesigners') . '

'; - $res .= '

' . $bureau['coordonnees']['adresse'] . '

'; - $res .= '

' . $bureau['coordonnees']['code_postal'] . ' ' . $bureau['coordonnees']['ville'] . '

'; - $res .= '

' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory') . '

'; - $res .= '

'; + $res .= '
'; + $event = array('category' => 'map', 'action' => 'click', 'label' => $bureau['coordonnees']['ville']); + $res .= $this->view->linkGeo($this->view->linkArrow(__("Voir le plan")), $bureau['coordonnees']['adresse'] . ',' . $bureau['coordonnees']['ville'] . ',' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory'), array('class' => 'animated-arrow', 'data-event' => $event)); + $res .= '
'; - $res .= '
'; - $event = array('category' => 'map', 'action' => 'click', 'label' => $bureau['coordonnees']['ville']); - $res .= $this->view->linkGeo($this->view->linkArrow(__("Voir le plan")), $bureau['coordonnees']['adresse'] . ',' . $bureau['coordonnees']['ville'] . ',' . Zend_Locale::getTranslation($bureau['coordonnees']['pays'], 'territory'), array('class' => 'animated-arrow', 'data-event' => $event)); - $res .= '
'; + $res .= '
'; + } - $res .= '
'; - } - - return $res; - } + return $res; + } } diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php index 03f8950..df356fe 100644 --- a/framework/application/views/helpers/Liste.php +++ b/framework/application/views/helpers/Liste.php @@ -11,6 +11,7 @@ class Cubedesigners_View_Helper_Liste extends CubeIT_View_Helper_Abstract { if ($items['titre']) { $t = '

' . ucfirst($items['titre']) . '

'; + // Link title if applicable if ($items['button']['label']) { $title_link = $items['button']; // Copy the button details @@ -19,6 +20,10 @@ class Cubedesigners_View_Helper_Liste extends CubeIT_View_Helper_Abstract { } else { $res .= $t; // no link on the title } + + if($items['text']) { + $res .= '

' . $items['text'] . '

'; + } } $res .= $this->view->homeBlocs($items, $displayDetailsButtons, $cols); if ($items['button']['label']) { diff --git a/less/common.less b/less/common.less index a3858b6..2665f13 100644 --- a/less/common.less +++ b/less/common.less @@ -22,9 +22,9 @@ img.responsive { } body { - background-color: #fafafa; + background-color: #ffffff; font-family: @roboto; - font-size: 18px; + font-size: 20px; font-weight: 300; color: #1b1b1b; opacity: 0; @@ -49,12 +49,16 @@ h1, h2, h3, h4, h5, h6, blockquote { -webkit-font-smoothing: antialiased; } -h1, h2, h3, h4, h5, h6 { - font-weight: 300; +h3, h4, h5, h6 { + font-weight: 600; +} + +h1,h2{ + font-weight: 700; } strong, b { - font-weight: 400; + font-weight: 600; } a { diff --git a/less/footer.less b/less/footer.less index ea06d37..48fefc3 100644 --- a/less/footer.less +++ b/less/footer.less @@ -6,10 +6,10 @@ } a { - //.link(@yellow, #000); + //.link(@yellow, #242323); text-decoration: none; &.but { - .button(#000, transparent); + .button(#242323, transparent); border: 0; padding: 15px; } @@ -17,19 +17,22 @@ .dotclear { a { - .link(@yellow, #000); + .link(#242323, #242323); } } .footer-top { padding: 50px 0 0 0; - background-color: #F5F5F5; + background-color: #eeeeee; .footer-top-content { + overflow: hidden; padding-bottom: 50px; white-space: nowrap; .bloc { + + float: left; white-space: normal; vertical-align: top; @@ -51,9 +54,9 @@ } h2 { - color: #000; + color: #242323; padding-bottom: 36px; - font-size: 40px; + font-size: 56px; @media screen and (max-width: 1000px) { padding-bottom: 30px; @@ -74,7 +77,7 @@ } .actu { - color: #000; + color: #242323; padding-bottom: 20px; &:last-child { @@ -82,7 +85,7 @@ } a { - color: #000; + color: #242323; } h3 { @@ -101,32 +104,28 @@ } .contact-texte { - color: #000; + color: #242323; padding-bottom: 50px; + padding-left: 60px; + background-image: url('../images/picto_footer_mail.svg'); } .bureau { float: left; width: 50%; vertical-align: top; - color: #000; - padding-right: 21px; + color: #242323; - &:last-child { - padding-right: 0; - padding-left: 21px; + h5{ + margin: 20px 0; + font-size: 16px; } + @media screen and (max-width: 1000px) { width: auto; float: none; display: inline-block; padding: 0 0 20px 0; - margin-right: 40px; - - &:last-child { - padding: 0; - margin: 0; - } } .titre, .numeros { @@ -172,7 +171,7 @@ } } .footer-bottom { - background-color: #F5F5F5; + background-color: #eeeeee; height: 46px; //color: #6c6c6c; text-align: left; @@ -195,7 +194,7 @@ line-height: 1; text-transform: uppercase; margin: 0 0 0 10px; - .link(#000, @yellow); + .link(#242323, @yellow); &.active, &:hover { color: @yellow; diff --git a/less/home.less b/less/home.less index bd80aca..b279127 100644 --- a/less/home.less +++ b/less/home.less @@ -83,9 +83,9 @@ nav.active[role="navigation"] { margin: 0 auto; h1 { - font-size: 85px; + font-size: 90px; text-transform: none; - font-weight: 400; + font-weight: 600; } h2 { diff --git a/less/list.less b/less/list.less index 08de4e1..62768bb 100644 --- a/less/list.less +++ b/less/list.less @@ -12,6 +12,17 @@ section.list { background-color: #eeeff3; } + &.blue { + background-color: #05498c; + color: #fff; + + a { + color: #fff; + } + + + } + &#expertisehome { background-color: #fff; color: #1b1b1b; @@ -19,78 +30,90 @@ section.list { } .bloc-holder { + overflow: hidden; + + h2 { + font-size: 56px; + font-weight: 700; + line-height: 1; + display: inline-block; + } + + p { + margin: 20px 0; + } + + h3 { + font-size: 30px; + font-weight: 300; + line-height: 1; + margin-bottom: 10px; + } + + a { + text-decoration: none; + } + + a.but { + background-color: @yellow; + } + + .blocs { + padding: 40px 0; overflow: hidden; - h2 { - font-size: 56px; - line-height: 1; - display: inline-block; - } - h3 { - font-size: 32px; - line-height: 1; - margin-bottom: 10px; - } - a { - text-decoration: none; - } - a.but { - background-color: @yellow; - } - .blocs { - padding: 40px 0; - overflow: hidden; - - &.two { -// margin-bottom: -50px; // Offset the 50px margins on the .sousbloc - - // Special case for home page where link buttons are sitting under blocks and spacing is too big - + a.but { - margin-top: -30px; - float: left; - } - - .sousbloc { - white-space: normal; - width: 50%; - padding-right: 20px; - margin-bottom: 50px; - - &:nth-of-type(odd) { - .pr-2vw; - } - &:nth-of-type(even) { - .pl-2vw; - } - - @media screen and (max-width: 990px) { - display: block; - width: 100%; - - &:nth-of-type(2n) { - padding: 0; - } - } - } + &.two { + // margin-bottom: -50px; // Offset the 50px margins on the .sousbloc + + // Special case for home page where link buttons are sitting under blocks and spacing is too big + + a.but { + margin-top: -30px; + float: left; + } + + .sousbloc { + white-space: normal; + width: 50%; + padding-right: 20px; + margin-bottom: 50px; + + &:nth-of-type(odd) { + .pr-2vw; } - .sousbloc { - display: inline-block; - vertical-align: top; - margin: 0 0 50px 0; - &:extend(.media); - - &:last-child { - margin-bottom: 0; - } - - .text { - &:extend(.media--body); - } - img { - &:extend(.media--item); - } + &:nth-of-type(even) { + .pl-2vw; } + + @media screen and (max-width: 990px) { + display: block; + width: 100%; + + &:nth-of-type(2n) { + padding: 0; + } + } + } + } + + .sousbloc { + display: inline-block; + vertical-align: top; + margin: 0 0 50px 0; + &:extend(.media); + + &:last-child { + margin-bottom: 0; + } + + .text { + &:extend(.media--body); + } + + img { + &:extend(.media--item); + } } + } } -- 2.39.5