Skip to content

Commit 1552216

Browse files
committed
Merge branch 'main' into readme_improvements
2 parents a9e819c + 6c979e5 commit 1552216

File tree

8 files changed

+18
-22
lines changed

8 files changed

+18
-22
lines changed

.github/workflows/semgrep.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- .github/workflows/semgrep.yml
99
schedule:
1010
# random HH:MM to avoid a load spike on GitHub Actions at 00:00
11-
- cron: 12 15 * * *
11+
- cron: 0 7 * * *
1212
jobs:
1313
semgrep:
1414
name: Scan

.github/workflows/unit-tests.yml

-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ jobs:
1919
pip install -r requirements.txt
2020
- name: Ensure Config
2121
run: cp config.json.sample config.json
22-
- name: Ensure git pat token
23-
shell: bash
24-
env:
25-
CUSTOM_GITHUB_ACTIONS_PAT: ${{ secrets.CUSTOM_GITHUB_ACTIONS_PAT }}
26-
run: |
27-
sed -i "s|https://github.com/browserstack/enigma-access-modules.git|https://qwe:[email protected]/browserstack/enigma-access-modules.git|g" config.json
2822
- name: Setup access modules code base
2923
run: python -m scripts.clone_access_modules
3024
- name: Ensure access modules dependencies

.semgrepignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.md
2+
3+
nginx.conf.sample

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ References:
136136

137137

138138
## License
139-
See [LICENSE.md](.github/LICENSE.md)
139+
See [LICENSE.md](/LICENSE.md)

docs/https-nginx-setup.md docs/HTTPS setup/https-nginx-setup.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Following are the steps to Setup Nginx in enigma
66
- Should have a host(domain) with ssl certificats that can be attached to nginx.
77
- Make sure the host points the public IP of the machine in which enigma is running on. (i.e., create an dns A record with host pointing to public IP of machine)
88
2. Create a folder in the root folder of enigma named `certs` which contains ssl certificate and key.
9-
3. Copy `nginx.conf.sample` file to `nginx.conf`
9+
3. Copy `nginx.conf.sample` file in this folder to `nginx.conf`
1010
3. Configure `nginx.conf` file.
1111
- update the hostname in the `nginx.conf` file
1212
```diff
File renamed without changes.

docs/“How-to” guides/User Guides/First User Setup.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,30 @@ To setup admin user on enigma, follow these steps:
66

77
- Exec into the Enigma container if you are using docker
88

9-
```bash
10-
docker exec -it enigma bash
11-
```
9+
```bash
10+
docker exec -it enigma bash
11+
```
1212

1313
- Run the following command in the container to create a superuser
1414

15-
```bash
16-
python manage.py createsuperuser
17-
```
15+
```bash
16+
python manage.py createsuperuser
17+
```
1818

1919
- Fill in the `username`, `email` and `password` for admin user
2020

21-
Detailed instructions are available [here](https://docs.djangoproject.com/en/1.8/intro/tutorial02/#creating-an-admin-user)
21+
Checkout detailed instructions are on Django documentation [here](https://docs.djangoproject.com/en/4.2/intro/tutorial02/#creating-an-admin-user).
2222

2323
2. Sign-in into the admin site
2424

2525
- Login to the admin site with the credentials created above.
2626

27-
The admin site should be available at `/admin` with the base url on which enigma is hosted.
27+
The admin site should be available at `/admin` with the base url on which enigma is hosted.
2828

29-
This will be `http://localhost:8000/admin` if you are running this locally
29+
This will be `http://localhost:8000/admin` if you are running this locally
3030

3131
3. Now you can view the Enigma app dashboard, by navigating to enigma url.
3232

33-
This will be `http://localhost:8000/` if you are running this locally
33+
This will be `http://localhost:8000/` if you are running this locally
3434

35-
36-
To create additional users, follow the doc [here](/docs/%E2%80%9CHow-to%E2%80%9D%20guides/Managing%20Groups/Adding%20Users.md)
35+
To create additional users, follow the doc [here](/docs/%E2%80%9CHow-to%E2%80%9D%20guides/Managing%20Groups/Adding%20Users.md).

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pytz==2021.3
7575
pyvim==3.0.2
7676
pyvmomi==7.0.1
7777
PyYAML==6.0
78-
requests==2.28.0
78+
requests==2.31.0
7979
requests-oauthlib==1.3.0
8080
rsa==4.7
8181
s3transfer==0.6.0

0 commit comments

Comments
 (0)