Skip to content

Commit 3f67055

Browse files
committed
Merging devel.
2 parents 73e9ad0 + a6b07dc commit 3f67055

File tree

11 files changed

+1453
-1267
lines changed

11 files changed

+1453
-1267
lines changed

RELEASE

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
2.0.2
1+
2.0.3
22

3-
## Changes since 2.0.1
3+
## Changes since 2.0.2
44

5-
* Using https://github.com/codeenigma/ce-dev-ce-provision-config 2.x
6-
* Removed yarn as dependency, using only npm
7-
* Updated references to 2.x-devel with devel-2.x
5+
* Fixed regex.test executed by the 'ce-dev shell' command.
6+
* Packages updated

docker-images/controller-ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN \
4646
chmod 600 /home/controller/.ssh/id_rsa && \
4747
chmod 644 /home/controller/.ssh/id_rsa.pub
4848

49-
RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
49+
RUN su - ce-dev -c "git clone --branch 2.x https://gitlab.com/code-enigma/ce-provision.git /home/ce-dev/ce-provision"
5050

5151
COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
5252

docker-images/controller-ci/provision.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
ce_provision:
1616
venv_path: "/home/{{ _ce_provision_username }}/ansible"
1717
venv_command: /usr/bin/python3 -m venv
18-
own_repository: https://github.com/codeenigma/ce-provision.git
18+
own_repository: https://gitlab.com/code-enigma/ce-provision.git
1919
own_repository_branch: 2.x
2020
own_repository_skip_checkout: false
21-
config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git
21+
config_repository: https://gitlab.com/code-enigma/ce-dev-ce-provision-config.git
2222
config_repository_branch: 2.x
2323
config_repository_skip_checkout: false
2424
username: "{{ _ce_provision_username }}"

docker-images/controller-devel/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
/tmp/*
2020

2121

22-
RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
22+
RUN su - ce-dev -c "git clone --branch devel-2.x https://gitlab.com/code-enigma/ce-provision.git /home/ce-dev/ce-provision"
2323

2424
COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
2525

docker-images/controller-devel/provision.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
ce_deploy:
1616
venv_path: "/home/{{ _ce_provision_username }}/ansible"
1717
venv_command: /usr/bin/python3 -m venv
18-
own_repository: https://github.com/codeenigma/ce-deploy.git
19-
config_repository: https://github.com/codeenigma/ce-dev-ce-deploy-config.git
20-
own_repository_branch: 1.x
21-
config_repository_branch: 1.x
18+
own_repository: https://gitlab.com/code-enigma/ce-deploy.git
19+
config_repository: https://gitlab.com/code-enigma/ce-dev-ce-deploy-config.git
20+
own_repository_branch: devel-1.x
21+
config_repository_branch: devel-1.x
2222
username: ce-dev
2323
install_username: "{{ _ce_provision_username }}"
2424
upgrade_timer_name: upgrade_ce_provision_ansible
@@ -39,11 +39,11 @@
3939
ce_provision:
4040
venv_path: "/home/{{ _ce_provision_username }}/ansible"
4141
venv_command: /usr/bin/python3 -m venv
42-
own_repository: https://github.com/codeenigma/ce-provision.git
43-
own_repository_branch: 2.x
42+
own_repository: https://gitlab.com/code-enigma/ce-provision.git
43+
own_repository_branch: devel-2.x
4444
own_repository_skip_checkout: false
45-
config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git
46-
config_repository_branch: 2.x
45+
config_repository: https://gitlab.com/code-enigma/ce-dev-ce-provision-config.git
46+
config_repository_branch: devel-2.x
4747
config_repository_skip_checkout: false
4848
username: "{{ _ce_provision_username }}"
4949
install_username: "{{ _ce_provision_username }}"

docker-images/controller/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
/tmp/*
2020

2121

22-
RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
22+
RUN su - ce-dev -c "git clone --branch 2.x https://gitlab.com/code-enigma/ce-provision.git /home/ce-dev/ce-provision"
2323

2424
COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
2525

docker-images/controller/provision.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
ce_deploy:
1616
venv_path: "/home/{{ _ce_provision_username }}/ansible"
1717
venv_command: /usr/bin/python3 -m venv
18-
own_repository: https://github.com/codeenigma/ce-deploy.git
19-
config_repository: https://github.com/codeenigma/ce-dev-ce-deploy-config.git
18+
own_repository: https://gitlab.com/code-enigma/ce-deploy.git
19+
config_repository: https://gitlab.com/code-enigma/ce-dev-ce-deploy-config.git
2020
own_repository_branch: 1.x
2121
config_repository_branch: 1.x
2222
username: ce-dev
@@ -39,10 +39,10 @@
3939
ce_provision:
4040
venv_path: "/home/{{ _ce_provision_username }}/ansible"
4141
venv_command: /usr/bin/python3 -m venv
42-
own_repository: https://github.com/codeenigma/ce-provision.git
42+
own_repository: https://gitlab.com/code-enigma/ce-provision.git
4343
own_repository_branch: 2.x
4444
own_repository_skip_checkout: false
45-
config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git
45+
config_repository: https://gitlab.com/code-enigma/ce-dev-ce-provision-config.git
4646
config_repository_branch: 2.x
4747
config_repository_skip_checkout: false
4848
username: "{{ _ce_provision_username }}"

docs/Install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sudo sysctl -p # Or better yet, reboot.
7474
To install ce-dev itself, use this one-liner:
7575

7676
```
77-
curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/2.x/install.sh | /bin/sh -s -- linux
77+
curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/2.x/install.sh | /bin/sh -s -- --platform linux
7878
```
7979

8080
_note for the "I don't trust your install script" crowd out there... 1. Just follow the link to see what this script does. 2. If you don't trust the install script, why would you trust the rest of the program in the first place?_

0 commit comments

Comments
 (0)