diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7a975d..9afe8b5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,29 +4,18 @@ If you are interested in making a contribution there are a few ways you could he ## Filing issues -- Work on AlmaLinux OS web presence is managed - in [JIRA Web Presence project](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9) and is the preferred place - for submitting issues, bugs and feature requests. -- You are free to use [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) to submit bugs and for - discussions related to the codebase. - -Both JIRA Web Presence project and GitHub issues are used to track community feedback, however **JIRA Web Presence project - is primary** and all web presence related work will is managed there, whereas GitHub serves as primary point for -community input. - -Community members can choose to submit issues in either, whereas AlmaLinux OS organization members should prioritize use -of JIRA instead. +You are free to use [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) to submit bugs and for +discussions related to the codebase. ### Reporting a Bug Good bug reports can be very helpful. A bug is a demonstrable problem with the code or functionality. -Please use the [JIRA Web Presence project](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9) -and [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) — check if the issue has already been reported. +Please use the [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) and check if the issue has +already been reported. A good bug report should be as detailed as possible, so that others won't have to follow up for the essential details. -- Submit a bug in [JIRA Web Presence project](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9); OR - Submit a bug in [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) ### Requesting a Feature @@ -36,13 +25,12 @@ A good bug report should be as detailed as possible, so that others won't have t 1. If no previous requests exist, create a new issue. Please be as clear as possible about why the feature is needed and the intended use case. -- Request a feature in [JIRA Web Presence project](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9); OR - Request a feature in [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) ## Contributing code If you plan to propose code changes it is required you create -an [issue](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9) with a brief proposal and discuss it with +an [issue](https://github.com/AlmaLinux/almalinux.org/issues) with a brief proposal and discuss it with us first. This is necessary to avoid more than one contributor working on the same feature/change and to avoid someone from @@ -50,7 +38,7 @@ spending time on feature/change that would not be merged for any reason. For smaller contributions use this workflow: -* Create an [issue](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9) describing the changes. +* Create an [issue](https://github.com/AlmaLinux/almalinux.org/issues) describing the changes. * Await confirmation from contributors. * Fork the project. * Create a branch for your feature or bug fix. diff --git a/README.md b/README.md index ffa8381..03009e7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![almalinux.org](./screenshot.png)](https://almalinux.org) -This repository contains website source code for future https://almalinux.org. +This repository contains website source code for https://almalinux.org. This website is built with Python using Django web framework. It uses MariaDB as database backend, Docker and docker-compose for development environment deployment, and Pipenv is used to track project diff --git a/ansible/roles/website/tasks/docker.yml b/ansible/roles/website/tasks/docker.yml index e3fed26..a43ed46 100644 --- a/ansible/roles/website/tasks/docker.yml +++ b/ansible/roles/website/tasks/docker.yml @@ -25,11 +25,11 @@ become: yes - name: Ensure latest pip - pip: name='pip' executable='pip3' extra_args='--upgrade' + pip: name='pip' executable='/usr/local/bin/pip3' extra_args='--upgrade' become: yes - name: Install docker-compose - pip: name='docker-compose' executable='pip3' + pip: name='docker-compose' executable='/usr/local/bin/pip3' become: yes - name: Enable and start Docker service diff --git a/ansible/roles/website/tasks/nginx.yml b/ansible/roles/website/tasks/nginx.yml index 27582e9..b2ffa61 100644 --- a/ansible/roles/website/tasks/nginx.yml +++ b/ansible/roles/website/tasks/nginx.yml @@ -14,7 +14,7 @@ - meta: flush_handlers - name: Install certbot - pip: name='certbot' executable='pip3' + pip: name='certbot' executable='/usr/local/bin/pip3' become: yes - name: Configure NGINX upstream repository