Skip to content

Commit

Permalink
Merge d9d90e5 into a5c0ba0
Browse files Browse the repository at this point in the history
  • Loading branch information
ralphbean committed Oct 18, 2023
2 parents a5c0ba0 + d9d90e5 commit 4b0748a
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 818 deletions.
20 changes: 0 additions & 20 deletions docs/source/config-file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,6 @@ The config file is made up of multiple parts
* This is the default JIRA instance to be used if none is provided in the project.

.. code-block:: python
'confluence_statistics': False
* Adds the ability to post statistics to confluence. See note below.

.. note:: Optional: Confluence Statistic Support

a. What is it? If :code:`confluence_statistics` is set to `True` in the config file (default `False`) you can set up a Confluence page and space to post statistic too (i.e. how many comments synced etc)

b. Set up the following variables:
1. :code:`CONFLUENCE_SPACE` :: The Confluence space we're posting too
2. :code:`CONFLUENCE_PAGE_TITLE` :: The Confluence page we're posting too
3. :code:`CONFLUENCE_URL` :: The Confluence URL
4. :code:`CONFLUENCE_USERNAME` :: Confluence username data
5. :code:`CONFLUENCE_PASSWORD` :: Confluence password data

c. Create the related confluence page and space. Make sure to add the template (use :code:`sync2jira/confluence_stat.jinja` and replace the JINJA code with 0's


.. code-block:: python
'jira': {
Expand Down
8 changes: 0 additions & 8 deletions docs/source/confluence_client.rst

This file was deleted.

3 changes: 1 addition & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ Sync2Jira documentation
downstream_pr
downstream_issue
intermediary
mailer
confluence_client
mailer
13 changes: 6 additions & 7 deletions docs/source/sync_page.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ Related to OpenShift:
2. :code:`DEFAULT_SERVER` :: Default server to use for mailing
3. :code:`DEFAULT_FROM` :: Default from to use for mailing
4. :code:`USER` :: JIRA username
5. :code:`CONFLUENCE_SPACE` :: Confluence space (should be set to "mock_confluence_space" as we don't want any confluence syncing)
6. :code:`INITIALIZE` :: True/False Initialize our repos on startup (Should be set to "0")
7. :code:`IMAGE_URL` :: Image URL:TAG to pull from
8. :code:`JIRA_PNT_PASS` :: PNT password in base64
9. :code:`JIRA_OMEGAPRIME_PASS` :: Omegaprime password in base64
10. :code:`GITHUB_TOKEN` :: GitHub token in base64
11. :code:`PAAS_DOMAIN` :: Domain to use for the service
5. :code:`INITIALIZE` :: True/False Initialize our repos on startup (Should be set to "0")
6. :code:`IMAGE_URL` :: Image URL:TAG to pull from
7. :code:`JIRA_PNT_PASS` :: PNT password in base64
8. :code:`JIRA_OMEGAPRIME_PASS` :: Omegaprime password in base64
9. :code:`GITHUB_TOKEN` :: GitHub token in base64
10. :code:`PAAS_DOMAIN` :: Domain to use for the service

You can also use the OpenShift template to quickly deploy this service (it can be found in the repo under :code:`openshift/sync2jira-sync-page-template.yaml`)

Expand Down
245 changes: 0 additions & 245 deletions sync2jira/confluence_client.py

This file was deleted.

55 changes: 0 additions & 55 deletions sync2jira/confluence_stat.jinja

This file was deleted.

0 comments on commit 4b0748a

Please sign in to comment.