Browse Source

Fix pip3, update READMEs

pull/16/head
Matīss Treinis 4 years ago
parent
commit
b68d4ef56a
No known key found for this signature in database GPG Key ID: 9123B913EBF53D43
  1. 24
      CONTRIBUTING.md
  2. 2
      README.md
  3. 4
      ansible/roles/website/tasks/docker.yml
  4. 2
      ansible/roles/website/tasks/nginx.yml

24
CONTRIBUTING.md

@ -4,29 +4,18 @@ If you are interested in making a contribution there are a few ways you could he
## Filing issues ## Filing issues
- Work on AlmaLinux OS web presence is managed You are free to use [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) to submit bugs and for
in [JIRA Web Presence project](https://almalinux.atlassian.net/secure/RapidBoard.jspa?rapidView=9) and is the preferred place discussions related to the codebase.
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.
### Reporting a Bug ### Reporting a Bug
Good bug reports can be very helpful. A bug is a demonstrable problem with the code or functionality. 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) Please use the [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) and check if the issue has
and [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues) — check if the issue has already been reported. 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. 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) - Submit a bug in [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues)
### Requesting a Feature ### 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 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. 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) - Request a feature in [GitHub issues](https://github.com/AlmaLinux/almalinux.org/issues)
## Contributing code ## Contributing code
If you plan to propose code changes it is required you create 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. us first.
This is necessary to avoid more than one contributor working on the same feature/change and to avoid someone from 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: 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. * Await confirmation from contributors.
* Fork the project. * Fork the project.
* Create a branch for your feature or bug fix. * Create a branch for your feature or bug fix.

2
README.md

@ -2,7 +2,7 @@
[![almalinux.org](./screenshot.png)](https://almalinux.org) [![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, 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 Docker and docker-compose for development environment deployment, and Pipenv is used to track project

4
ansible/roles/website/tasks/docker.yml

@ -25,11 +25,11 @@
become: yes become: yes
- name: Ensure latest pip - 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 become: yes
- name: Install docker-compose - name: Install docker-compose
pip: name='docker-compose' executable='pip3' pip: name='docker-compose' executable='/usr/local/bin/pip3'
become: yes become: yes
- name: Enable and start Docker service - name: Enable and start Docker service

2
ansible/roles/website/tasks/nginx.yml

@ -14,7 +14,7 @@
- meta: flush_handlers - meta: flush_handlers
- name: Install certbot - name: Install certbot
pip: name='certbot' executable='pip3' pip: name='certbot' executable='/usr/local/bin/pip3'
become: yes become: yes
- name: Configure NGINX upstream repository - name: Configure NGINX upstream repository

Loading…
Cancel
Save