diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-11-27 21:36:20 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-11-27 21:36:20 -0500 |
| commit | 5dd83086864365930e3e7685562feaedcde1e5c3 (patch) | |
| tree | 74e8f0d010554b734cbe838d8c5b5047ff26fc58 | |
| parent | 9c2120eb340ee3361f73320543d555151f6d8c85 (diff) | |
| parent | 4f8d888e661caea4aea523142bd3a4badc334b71 (diff) | |
| download | gitea-5dd83086864365930e3e7685562feaedcde1e5c3.tar.gz gitea-5dd83086864365930e3e7685562feaedcde1e5c3.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
| -rw-r--r-- | conf/app.ini | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/conf/app.ini b/conf/app.ini index e0620f31d6..2bd32eca60 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -22,6 +22,11 @@ DISABLE_ROUTER_LOG = false ; Generate steps: ; $ cd path/to/gogs/custom/https ; $ ./gogs cert -ca=true -duration=8760h0m0s -host=myhost.example.com +; +; Or from a .pfx file exported from the Windows certificate store (do +; not forget to export the private key): +; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys +; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes CERT_FILE = custom/https/cert.pem KEY_FILE = custom/https/key.pem ; Upper level of template and static file path |