rebase networking examples on core services

.github/workflows/pr-core-tests.yml

@@ -20,7 +20,7 @@ jobs:
           - examples/lando-101
           - examples/landofile-custom
           - examples/long-name
-          # - examples/networking
+          - examples/networking
           # - examples/proxy
           # - examples/scanner
           # - examples/services

examples/networking/.lando.lamp.yml

@@ -0,0 +1,29 @@
+name: lando-lamp
+proxy:
+  appserver:
+    - lando-lamp.lndo.site
+services:
+  appserver:
+    api: 3
+    type: lando
+    ssl: true
+    services:
+      image: php:8.2-apache
+      command: docker-php-entrypoint apache2-foreground
+      volumes:
+        - ./apache.conf:/etc/apache2/sites-enabled/000-default.conf
+      ports:
+        - 80
+  database:
+    api: 3
+    type: lando
+    services:
+      image: mariadb:10.4
+      command: docker-entrypoint.sh mysqld
+      environment:
+        MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: da
+        MARIADB_MYSQL_LOCALHOST_USER: da
+        MARIADB_DATABASE: test
+        MARIADB_USER: test
+        MARIADB_PASSWORD: test
+        MARIADB_AUTO_UPGRADE: da

examples/networking/.lando.lemp.yml

@@ -0,0 +1,45 @@
+name: lando-lemp
+proxy:
+  appserver_nginx:
+    - lando-lemp.lndo.site
+  placeholder:
+    - placeholder.lando-lemp.lndo.site
+services:
+  placeholder:
+    api: 3
+    type: lando
+    ssl: true
+    services:
+      image: php:8.2-apache
+      command: docker-php-entrypoint apache2-foreground
+      volumes:
+        - ./apache.conf:/etc/apache2/sites-enabled/000-default.conf
+      ports:
+        - 80
+  appserver_nginx:
+    api: 4
+    image:
+      imagefile: nginx:1.22.1
+      context:
+        - ./nginx.conf:/etc/nginx/conf.d/default.conf
+    ports:
+      - 80
+    volumes:
+      - ./:/var/www/html
+    links:
+      - appserver
+  appserver:
+    api: 4
+    image: php:8.2-fpm
+    volumes:
+      - ./:/var/www/html
+  database:
+    api: 4
+    image: mariadb:10.4
+    environment:
+      MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: da
+      MARIADB_MYSQL_LOCALHOST_USER: da
+      MARIADB_DATABASE: test
+      MARIADB_USER: test
+      MARIADB_PASSWORD: test
+      MARIADB_AUTO_UPGRADE: da

examples/networking/README.md

@@ -12,15 +12,18 @@ Start up tests
 
 ```bash
 # Should init and start a lamp recipe
-rm -rf lamp
-lando init --source cwd --recipe lamp --name lando-lamp --webroot . --dest lamp
+rm -rf lamp && mkdir -p lamp
 cp -rf index.php lamp/index.php
+cp -rf apache.conf lamp/apache.conf
+cp -rf .lando.lamp.yml lamp/.lando.yml
 cd lamp && lando start
 
 # Should init and start a lemp recipe
-rm -rf lemp
-lando init --source cwd --recipe lemp --name lando-lemp --webroot . --dest lemp
+rm -rf lemp && mkdir -p lemp
 cp -rf index.php lemp/index.php
+cp -rf apache.conf lamp/apache.conf
+cp -rf nginx.conf lemp/nginx.conf
+cp -rf .lando.lemp.yml lemp/.lando.yml
 cd lemp && lando start
 ```
 
@@ -37,15 +40,23 @@ lando ssh -s appserver -c "cat /certs/cert.ext | grep landolamp.internal"
 lando ssh -s appserver -c "cat /certs/cert.ext | grep appserver"
 lando ssh -s appserver -c "cat /certs/cert.ext | grep localhost"
 
-# Should be able to curl lemp from lamp at proxy addresses and internal hostname
+# Should be able to curl lemp from lamp at proxy addresses and internal hostnames
 cd lamp
-lando ssh -s appserver -c "curl https://lando-lemp.lndo.site"
-lando ssh -s appserver -c "curl https://appserver_nginx.landolemp.internal"
+lando ssh -s appserver -c "curl http://lando-lemp.lndo.site"
+lando ssh -s appserver -c "curl http://appserver_nginx.landolemp.internal"
+# lando ssh -s appserver -c "curl https://lando-lemp.lndo.site"
+# lando ssh -s appserver -c "curl https://appserver_nginx.landolemp.internal"
+lando ssh -s appserver -c "curl https://placeholder.lando-lemp.lndo.site"
+lando ssh -s appserver -c "curl https://placeholder.landolemp.internal"
 
 # Should be able to curl lamp from lemp at proxy addresses and internal hostname
 cd lemp
-lando ssh -s appserver -c "curl https://lando-lamp.lndo.site"
-lando ssh -s appserver -c "curl https://appserver.landolamp.internal"
+lando ssh -s appserver -c "curl http://lando-lamp.lndo.site"
+lando ssh -s appserver -c "curl http://appserver.landolamp.internal"
+# lando ssh -s appserver -c "curl https://lando-lamp.lndo.site"
+# lando ssh -s appserver -c "curl https://appserver.landolamp.internal"
+lando ssh -s placeholder -c "curl https://lando-lamp.lndo.site"
+lando ssh -s placeholder -c "curl https://appserver.landolamp.internal"
 
 # Should even be able to connect to a database in a different app
 cd lamp

examples/networking/apache.conf

@@ -0,0 +1,185 @@
+<VirtualHost *:80>
+  # WHAT IN THE WORLD HAPPENED TO YOU
+  # The ServerName directive sets the request scheme, hostname and port that
+  # the server uses to identify itself. This is used when creating
+  # redirection URLs. In the context of virtual hosts, the ServerName
+  # specifies what hostname must appear in the request's Host: header to
+  # match this virtual host. For the default virtual host (this file) this
+  # value is not decisive as it is used as a last resort host regardless.
+  # However, you must set it for any further virtual host explicitly.
+  ServerName appserver
+
+  ServerAdmin webmaster@localhost
+  DocumentRoot /app
+  <Directory />
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+    Order allow,deny
+    Allow from all
+    Require all granted
+  </Directory>
+
+  # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+  # error, crit, alert, emerg.
+  # It is also possible to configure the loglevel for particular
+  # modules, e.g.
+  #LogLevel info ssl:warn
+
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+  # For most configuration files from conf-available/, which are
+  # enabled or disabled at a global level, it is possible to
+  # include a line for only one particular virtual host. For example the
+  # following line enables the CGI configuration for this host only
+  # after it has been globally disabled with "a2disconf".
+  #Include conf-available/serve-cgi-bin.conf
+
+  # Pass some common ENVs, its ok if this fails
+  SetEnvIf x-forwarded-proto https HTTPS=on
+
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+  <VirtualHost *:443>
+    ServerAdmin webmaster@localhost
+    ServerName appserver
+
+    DocumentRoot /app
+    <Directory />
+      Options Indexes FollowSymLinks MultiViews
+      AllowOverride All
+      Order allow,deny
+      Allow from all
+      Require all granted
+    </Directory>
+    # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+    # error, crit, alert, emerg.
+    # It is also possible to configure the loglevel for particular
+    # modules, e.g.
+    #LogLevel info ssl:warn
+
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+    # For most configuration files from conf-available/, which are
+    # enabled or disabled at a global level, it is possible to
+    # include a line for only one particular virtual host. For example the
+    # following line enables the CGI configuration for this host only
+    # after it has been globally disabled with "a2disconf".
+    #Include conf-available/serve-cgi-bin.conf
+
+    #   SSL Engine Switch:
+    #   Enable/Disable SSL for this virtual host.
+    SSLEngine on
+
+    #   A self-signed (snakeoil) certificate can be created by installing
+    #   the ssl-cert package. See
+    #   /usr/share/doc/apache2/README.Debian.gz for more info.
+    #   If both key and certificate are stored in the same file, only the
+    #   SSLCertificateFile directive is needed.
+    SSLCertificateFile "/certs/cert.crt"
+    SSLCertificateKeyFile "/certs/cert.key"
+
+    #   Server Certificate Chain:
+    #   Point SSLCertificateChainFile at a file containing the
+    #   concatenation of PEM encoded CA certificates which form the
+    #   certificate chain for the server certificate. Alternatively
+    #   the referenced file can be the same as SSLCertificateFile
+    #   when the CA certificates are directly appended to the server
+    #   certificate for convenience.
+    #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
+
+    #   Certificate Authority (CA):
+    #   Set the CA certificate verification path where to find CA
+    #   certificates for client authentication or alternatively one
+    #   huge file containing all of them (file must be PEM encoded)
+    #   Note: Inside SSLCACertificatePath you need hash symlinks
+    #    to point to the certificate files. Use the provided
+    #    Makefile to update the hash symlinks after changes.
+    #SSLCACertificatePath /etc/ssl/certs/
+    #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
+
+    #   Certificate Revocation Lists (CRL):
+    #   Set the CA revocation path where to find CA CRLs for client
+    #   authentication or alternatively one huge file containing all
+    #   of them (file must be PEM encoded)
+    #   Note: Inside SSLCARevocationPath you need hash symlinks
+    #    to point to the certificate files. Use the provided
+    #    Makefile to update the hash symlinks after changes.
+    #SSLCARevocationPath /etc/apache2/ssl.crl/
+    #SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
+
+    #   Client Authentication (Type):
+    #   Client certificate verification type and depth.  Types are
+    #   none, optional, require and optional_no_ca.  Depth is a
+    #   number which specifies how deeply to verify the certificate
+    #   issuer chain before deciding the certificate is not valid.
+    #SSLVerifyClient require
+    #SSLVerifyDepth  10
+
+    #   SSL Engine Options:
+    #   Set various options for the SSL engine.
+    #   o FakeBasicAuth:
+    #  Translate the client X.509 into a Basic Authorisation.  This means that
+    #  the standard Auth/DBMAuth methods can be used for access control.  The
+    #  user name is the `one line' version of the client's X.509 certificate.
+    #  Note that no password is obtained from the user. Every entry in the user
+    #  file needs this password: `xxj31ZMTZzkVA'.
+    #   o ExportCertData:
+    #  This exports two additional environment variables: SSL_CLIENT_CERT and
+    #  SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+    #  server (always existing) and the client (only existing when client
+    #  authentication is used). This can be used to import the certificates
+    #  into CGI scripts.
+    #   o StdEnvVars:
+    #  This exports the standard SSL/TLS related `SSL_*' environment variables.
+    #  Per default this exportation is switched off for performance reasons,
+    #  because the extraction step is an expensive operation and is usually
+    #  useless for serving static content. So one usually enables the
+    #  exportation for CGI and SSI requests only.
+    #   o OptRenegotiate:
+    #  This enables optimized SSL connection renegotiation handling when SSL
+    #  directives are used in per-directory context.
+    #SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+    <FilesMatch "\.(cgi|shtml|phtml|php)$">
+        SSLOptions +StdEnvVars
+    </FilesMatch>
+    <Directory /usr/lib/cgi-bin>
+        SSLOptions +StdEnvVars
+    </Directory>
+
+    #   SSL Protocol Adjustments:
+    #   The safe and default but still SSL/TLS standard compliant shutdown
+    #   approach is that mod_ssl sends the close notify alert but doesn't wait for
+    #   the close notify alert from client. When you need a different shutdown
+    #   approach you can use one of the following variables:
+    #   o ssl-unclean-shutdown:
+    #  This forces an unclean shutdown when the connection is closed, i.e. no
+    #  SSL close notify alert is send or allowed to received.  This violates
+    #  the SSL/TLS standard but is needed for some brain-dead browsers. Use
+    #  this when you receive I/O errors because of the standard approach where
+    #  mod_ssl sends the close notify alert.
+    #   o ssl-accurate-shutdown:
+    #  This forces an accurate shutdown when the connection is closed, i.e. a
+    #  SSL close notify alert is send and mod_ssl waits for the close notify
+    #  alert of the client. This is 100% SSL/TLS standard compliant, but in
+    #  practice often causes hanging connections with brain-dead browsers. Use
+    #  this only for browsers where you know that their SSL implementation
+    #  works correctly.
+    #   Notice: Most problems of broken clients are also related to the HTTP
+    #   keep-alive facility, so you usually additionally want to disable
+    #   keep-alive for those clients, too. Use variable "nokeepalive" for this.
+    #   Similarly, one has to force some clients to use HTTP/1.0 to workaround
+    #   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+    #   "force-response-1.0" for this.
+    BrowserMatch "MSIE [2-6]" \
+        nokeepalive ssl-unclean-shutdown \
+        downgrade-1.0 force-response-1.0
+    # MSIE 7 and newer should be able to use keepalive
+    BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+
+    # Pass some common ENVs, its ok if this fails
+    SetEnvIf x-forwarded-proto https HTTPS=on
+  </VirtualHost>
+</IfModule>

examples/networking/nginx.conf

@@ -0,0 +1,16 @@
+server {
+    index index.php index.html;
+    server_name appserver;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /var/www/html;
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass appserver:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+    }
+}