Merge pull request #80 from kellerkinderDE/feature/customPortsHandling

Add custom ports handling

.github/workflows/test_examples.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Test ${{ matrix.manifest }} example
         run: |
           cd ${GITHUB_WORKSPACE}/examples/${{ matrix.manifest }}
-          sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3,url: path:${GITHUB_WORKSPACE}," devenv.yaml
+          sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0,url: path:${GITHUB_WORKSPACE}," devenv.yaml
           echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
           direnv allow && direnv reload
           devenv ci -vvv

devenv.nix

@@ -2,7 +2,7 @@
 let
   cfg = config.kellerkinder;
 
-  currentVersion = "v1.0.3";
+  currentVersion = "v2.0.0";
 
   listEntries = path:
     map (name: path + "/${name}") (builtins.attrNames (builtins.readDir path));
@@ -136,8 +136,20 @@ in {
 
     enableMysqlBinLog = lib.mkOption {
       type = lib.types.bool;
-      default = false;
       description = ''Enables MySQL binary logs'';
+      default = false;
+    };
+
+    httpPort = lib.mkOption {
+      type = lib.types.str;
+      description = ''Sets the HTTP port'';
+      default = "80";
+    };
+
+    httpsPort = lib.mkOption {
+      type = lib.types.str;
+      description = ''Sets the HTTPS port'';
+      default = "443";
     };
   };
 
@@ -194,8 +206,8 @@ in {
         MAILER_URL = lib.mkDefault "smtp://127.0.0.1:1025?encryption=&auth_mode=";
         MAILER_DSN = lib.mkDefault "smtp://127.0.0.1:1025?encryption=&auth_mode=";
 
-        APP_URL = lib.mkDefault "http://127.0.0.1:8000";
-        CYPRESS_baseUrl = lib.mkDefault "http://127.0.0.1:8000";
+        APP_URL = lib.mkDefault "http://127.0.0.1:${toString cfg.httpPort}";
+        CYPRESS_baseUrl = lib.mkDefault "http://127.0.0.1:${toString cfg.httpPort}";
 
         APP_SECRET = lib.mkDefault "devsecret";
 

docs/Options.md

@@ -165,3 +165,23 @@ Enables the MySQL Binary Log and adds configuration for it.
 ```
 kellerkinder.enableMysqlBinLog = false;
 ```
+
+# kellerkinder.httpPort
+Sets the http port for caddy.
+
+_This has to be a string_
+
+*_Example_*
+```
+kellerkinder.httpPort = "8080";
+```
+
+# kellerkinder.httpsPort
+Sets the https port for caddy.
+
+_This has to be a string_
+
+*_Example_*
+```
+kellerkinder.httpsPort = "8443";
+```

docs/Update.md

@@ -1,5 +1,16 @@
 # Updates
 
+
+## v2.0.0
+* If you still want to use custom ports, take a look at the [options](Options.md#kellerkinder-httpPort).
+* You have to adjust your `devenv.yaml` to
+  ```yml
+    ...
+    kellerkinder:
+      url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0
+      flake: false
+    ...
+  ```
 ## v1.0.0
 * You have to update to devenv version `0.6.3` or higher
 * You have to remove `http`, `https` and the ports (e.g. `8000`) from `kellerkinder.additionalServerAlias`

examples/sw5/devenv.yaml

@@ -5,7 +5,7 @@ inputs:
   nixpkgs:
     url: github:NixOS/nixpkgs/nixos-unstable
   kellerkinder:
-    url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
+    url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0
     flake: false
   phps:
     url: github:fossar/nix-phps

examples/sw6/devenv.yaml

@@ -5,7 +5,7 @@ inputs:
   nixpkgs:
     url: github:NixOS/nixpkgs/nixos-unstable
   kellerkinder:
-    url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
+    url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0
     flake: false
   phps:
     url: github:fossar/nix-phps

modules/caddy.nix

@@ -68,13 +68,10 @@ let
 
   caddyHostConfig = (lib.mkMerge
     (lib.forEach vhostDomains (domain: {
-      "http://${toString domain}" = {
+      "http://${toString domain}:${toString cfg.httpPort}" = lib.mkDefault {
         extraConfig = vhostConfig;
       };
-      "https://${toString domain}" = {
-        extraConfig = vhostConfigTls;
-      };
-      "https://${toString domain}:8000" = {
+      "https://${toString domain}:${toString cfg.httpsPort}" = lib.mkDefault {
         extraConfig = vhostConfigTls;
       };
     }))