diff --git a/.nginx-srv/sites-available/default b/.nginx-srv/sites-available/default new file mode 100644 index 0000000..c5af914 --- /dev/null +++ b/.nginx-srv/sites-available/default @@ -0,0 +1,91 @@ +## +# You should look at the following URL's in order to grasp a solid understanding +# of Nginx configuration files in order to fully unleash the power of Nginx. +# https://www.nginx.com/resources/wiki/start/ +# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/ +# https://wiki.debian.org/Nginx/DirectoryStructure +# +# In most cases, administrators will remove this file from sites-enabled/ and +# leave it as reference inside of sites-available where it will continue to be +# updated by the nginx packaging team. +# +# This file will automatically load configuration files provided by other +# applications, such as Drupal or Wordpress. These applications will be made +# available underneath a path with that package name, such as /drupal8. +# +# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. +## + +# Default server configuration +# +server { + listen 80 default_server; + listen [::]:80 default_server; + + # SSL configuration + # + # listen 443 ssl default_server; + # listen [::]:443 ssl default_server; + # + # Note: You should disable gzip for SSL traffic. + # See: https://bugs.debian.org/773332 + # + # Read up on ssl_ciphers to ensure a secure configuration. + # See: https://bugs.debian.org/765782 + # + # Self signed certs generated by the ssl-cert package + # Don't use them in a production server! + # + # include snippets/snakeoil.conf; + + root /var/www/html; + + # Add index.php to the list if you are using PHP + index index.html index.htm index.nginx-debian.html; + + server_name _; + + location / { + # First attempt to serve request as file, then + # as directory, then fall back to displaying a 404. + try_files $uri $uri/ =404; + } + + # pass PHP scripts to FastCGI server + # + #location ~ \.php$ { + # include snippets/fastcgi-php.conf; + # + # # With php-fpm (or other unix sockets): + # fastcgi_pass unix:/run/php/php7.4-fpm.sock; + # # With php-cgi (or other tcp sockets): + # fastcgi_pass 127.0.0.1:9000; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + + +# Virtual Host configuration for example.com +# +# You can move that to a different file under sites-available/ and symlink that +# to sites-enabled/ to enable it. +# +#server { +# listen 80; +# listen [::]:80; +# +# server_name example.com; +# +# root /var/www/example.com; +# index index.html; +# +# location / { +# try_files $uri $uri/ =404; +# } +#} diff --git a/.nginx-srv/www/html/index.nginx-debian.html b/.nginx-srv/www/html/index.nginx-debian.html new file mode 100644 index 0000000..e8f5622 --- /dev/null +++ b/.nginx-srv/www/html/index.nginx-debian.html @@ -0,0 +1,23 @@ + + + +Welcome to nginx! + + + +

Welcome to nginx!

+

If you see this page, the nginx web server is successfully installed and +working. Further configuration is required.

+ +

For online documentation and support please refer to +nginx.org.
+Commercial support is available at +nginx.com.

+ +

Thank you for using nginx.

+ + diff --git a/docker-compose.yaml b/docker-compose.yaml index 34dcd5f..ff1ed93 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,47 +1,10 @@ -# LEMP Linux NGINX MariaDB PHP - services: - multi-php-fpm: - restart: unless-stopped - image: eroncero/multi-php-fpm:latest - volumes: - #- ./etc/php/8.2/fpm/pool.d:/etc/php/8.2/fpm/pool.d - - multi-php-fpm_pool.d:/etc/php/8.2/fpm/pool.d - - multi-php-fpm_ipc_socketfile:/run/php/ - - nginx: - restart: unless-stopped - image: eroncero/nginx-srv:latest + nginx-srv: + image: eroncero/nginx-srv ports: - - 80:80 - - 443:443 - - [::]:80:80 - - [::]:443:443 - volumes: - - nginx_sites-available:/etc/nginx/sites-available - - nginx_www:/etc/nginx/sites-available - - nginx_logs:/var/log/nginx - - mariadb: + - "127.0.0.1:8888:80" + - "[::1]:8843:443" restart: unless-stopped - image: eroncero/mariadb-srv:latest - ports: - - 3306:3306 - - [::]:3306:3306 volumes: - - mysql_data:/var/lib/mysql - - mysql_config:/etc/mysql - - mysql_ipc_socketfile:/run/mysqld/mysqld.sock - -volumes: - multi-php-fpm_pool.d: - nginx_sites-available: - mysql_ipc_socketfile: - multi-php-fpm_ipc_socketfile: - nginx_logs: - nginx_www: - nginx_sites-available: - mysql_data: - mysql_config: - -#networks: + - .nginx-srv/sites-available:/etc/nginx/sites-available + - .nginx-srv/www:/var/www diff --git a/multi-php-fpm/Dockerfile b/multi-php-fpm/Dockerfile index cca32bf..190ac2a 100644 --- a/multi-php-fpm/Dockerfile +++ b/multi-php-fpm/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update; apt-get full-upgrade -y; apt-get autoclean -y COPY project/buildtime/sury-repo.sh /tmp/buildtime/sury-repo.sh RUN /bin/sh /tmp/buildtime/sury-repo.sh -ENV BUILDTIME_PHP_VER_INST="8.2" +ARG BUILDTIME_PHP_VER_INST="8.2" COPY project/buildtime/buildtime_php_ver_inst.sh /tmp/buildtime/buildtime_php_ver_inst.sh RUN /bin/sh /tmp/buildtime/buildtime_php_ver_inst.sh ENV DEF_PHP_INTERPRETER="8.2" diff --git a/nginx-srv/Dockerfile b/nginx-srv/Dockerfile index 668d32d..8ef4c77 100644 --- a/nginx-srv/Dockerfile +++ b/nginx-srv/Dockerfile @@ -6,4 +6,5 @@ COPY project/entrypoint/entrypoint.sh /entrypoint/entrypoint.sh COPY project/entrypoint/gen-cert.sh /entrypoint/gen-cert.sh #COPY project/entrypoint/install-nginx-mods.sh /entrypoint/install-nginx-mods.sh RUN mkdir /tmp/buildtime && cp /etc/nginx/sites-available/default /tmp/buildtime/default +RUN mkdir /tmp/www && cp -r /var/www/. /tmp/www/ ENTRYPOINT ["/bin/sh", "/entrypoint/entrypoint.sh"] diff --git a/nginx-srv/docker-compose.yaml b/nginx-srv/docker-compose.yaml deleted file mode 100644 index b2feea2..0000000 --- a/nginx-srv/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - nginx-srv: - image: eroncero/nginx-srv - ports: - - "127.0.0.1:8888:80" - - "[::1]:8843:443" - restart: unless-stopped - volumes: - - ./sites-available:/etc/nginx/sites-available diff --git a/nginx-srv/project/entrypoint/entrypoint.sh b/nginx-srv/project/entrypoint/entrypoint.sh index 3b90eb4..c99de36 100644 --- a/nginx-srv/project/entrypoint/entrypoint.sh +++ b/nginx-srv/project/entrypoint/entrypoint.sh @@ -8,6 +8,8 @@ done mv /tmp/buildtime/default /etc/nginx/sites-available/default +mv /tmp/www/* /var/www/ +chown -R www-data:www-data /var/www service nginx start tail -f /dev/null