Merge pull request #2038 from ogayot/proxy-doc

Add example for `proxy:` autoinstall directive.

doc/reference/autoinstall-reference.rst

@@ -360,7 +360,14 @@ proxy
 * **default:** no proxy
 * **can be interactive:** true
 
-The proxy to configure both during installation and for ``apt`` and ``snapd`` in the target system.
+The proxy to configure both during installation and for ``apt`` and ``snapd`` in the target system. This setting is currently not honoured when running the geoip lookup.
+
+Example:
+
+.. code-block:: yaml
+
+    autoinstall:
+      proxy: http://172.16.90.1:3128
 
 .. _ai-apt:
 

subiquity/server/geoip.py

@@ -74,6 +74,12 @@ class HTTPGeoIPStrategy(GeoIPStrategy):
     async def get_response(self) -> str:
         url = "https://geoip.ubuntu.com/lookup"
         async with aiohttp.ClientSession() as session:
+            # We probably want to honor proxy settings here; using
+            # session.get(url, proxy=...) so that we can perform a successful
+            # geoip lookup in a walled garden. Bear in mind that it would
+            # result in a geoip lookup of the proxy itself (the proxy initiates
+            # the connection to the geoip service) but in most cases this is
+            # what we want.
             async with session.get(url) as response:
                 response.raise_for_status()
                 return await response.text()

subiquity/server/ssh.py

@@ -40,6 +40,10 @@ async def fetch_keys_for_id(self, user_id: str) -> List[str]:
         cmd = ("ssh-import-id", "--output", "-", "--", user_id)
         env = None
         if self.app.base_model.proxy.proxy:
+            # This is probably not needed since ProxyController.POST and
+            # ProxyController.start both set the http_proxy / https_proxy
+            # variables. This was probably needed when SSH key import was done
+            # by the client though.
             env = os.environ.copy()
             env["https_proxy"] = self.app.base_model.proxy.proxy