Skip to content

Commit 5822fa5

Browse files
LucilleHLucilleH
authored
Update apache example with proper start command for jetify cloud (#2198)
## Summary Update apache example with proper start command for jetify cloud. ## How was it tested? locally
1 parent ce17002 commit 5822fa5

File tree

6 files changed

+47
-41
lines changed

6 files changed

+47
-41
lines changed

‎docs/app/docs/devbox_examples/servers/apache.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ Use `devbox services start|stop apache` to start and stop httpd in the backgroun
3232
### Helper Files
3333
The following helper files will be created in your project directory:
3434

35-
* \{PROJECT_DIR\}/devbox.d/apache/httpd.conf
35+
* \{PROJECT_DIR\}/devbox.d/apacheHttpd/httpd.conf
3636
* \{PROJECT_DIR\}/devbox.d/web/index.html
3737

38-
Note that by default, Apache is configured with `./devbox.d/web` as the DocumentRoot. To change this, you should copy and modify the default `./devbox.d/apache/httpd.conf`.
38+
Note that by default, Apache is configured with `./devbox.d/web` as the DocumentRoot. To change this, you should copy and modify the default `./devbox.d/apacheHttpd/httpd.conf`.
3939

4040
### Environment Variables
4141
```bash
42-
HTTPD_ACCESS_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apache/access.log
43-
HTTPD_ERROR_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apache/error.log
42+
HTTPD_ACCESS_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apacheHttpd/access.log
43+
HTTPD_ERROR_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apacheHttpd/error.log
4444
HTTPD_PORT=8080
4545
HTTPD_DEVBOX_CONFIG_DIR={PROJECT_DIR}
46-
HTTPD_CONFDIR={PROJECT_DIR}/devbox.d/apache
46+
HTTPD_CONFDIR={PROJECT_DIR}/devbox.d/apacheHttpd
4747
```
4848

4949
### Notes

‎examples/development/php/latest/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ For example -- to add the `ds` extension, run `devbox add php81Extensions.ds`, o
3535

3636
## PHP Plugin Details
3737

38-
The PHP Plugin will provide the following configuration when you install a PHP runtime with `devbox add`. You can also manually add the PHP plugin by adding `plugin:php` to your `includes` list in `devbox.json`:
38+
The PHP Plugin will provide the following configuration when you install a PHP runtime with `devbox add`. You can also manually add the PHP plugin by adding `plugin:php` to your `include` list in `devbox.json`:
3939

4040
```json
41-
"includes": [
41+
"include": [
4242
"plugin:php"
4343
]
4444
```

‎examples/servers/apache/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
devbox.d/apacheHttpd/apache.pid
2+
.devbox

‎examples/servers/apache/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ Use `devbox services start|stop apache` to start and stop httpd in the backgroun
3232

3333
The following helper files will be created in your project directory:
3434

35-
* {PROJECT_DIR}/devbox.d/apache/httpd.conf
35+
* {PROJECT_DIR}/devbox.d/apacheHttpd/httpd.conf
3636
* {PROJECT_DIR}/devbox.d/web/index.html
3737

38-
Note that by default, Apache is configured with `./devbox.d/web` as the DocumentRoot. To change this, you should copy and modify the default `./devbox.d/apache/httpd.conf`.
38+
Note that by default, Apache is configured with `./devbox.d/web` as the DocumentRoot. To change this, you should copy and modify the default `./devbox.d/apacheHttpd/httpd.conf`.
3939

4040
### Environment Variables
4141

4242
```bash
43-
HTTPD_ACCESS_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apache/access.log
44-
HTTPD_ERROR_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apache/error.log
43+
HTTPD_ACCESS_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apacheHttpd/access.log
44+
HTTPD_ERROR_LOG_FILE={PROJECT_DIR}/.devbox/virtenv/apacheHttpd/error.log
4545
HTTPD_PORT=8080
4646
HTTPD_DEVBOX_CONFIG_DIR={PROJECT_DIR}
47-
HTTPD_CONFDIR={PROJECT_DIR}/devbox.d/apache
47+
HTTPD_CONFDIR={PROJECT_DIR}/devbox.d/apacheHttpd
4848
```
4949

5050
### Notes

‎examples/servers/apache/devbox.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
2-
"packages": [
3-
"apacheHttpd@latest"
4-
],
2+
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
3+
"packages": ["[email protected]"],
54
"shell": {
6-
"init_hook": []
5+
"init_hook": [
6+
"echo 'Welcome to devbox!' > /dev/null"
7+
],
8+
"scripts": {
9+
"start": "apachectl start -f $HTTPD_CONFDIR/httpd.conf -D FOREGROUND"
10+
}
711
}
812
}

‎examples/servers/apache/devbox.lock‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
{
22
"lockfile_version": "1",
33
"packages": {
4-
"apacheHttpd@latest": {
5-
"last_modified": "2024-02-22T01:07:56Z",
4+
"apacheHttpd@2.4.58": {
5+
"last_modified": "2024-04-03T07:31:48Z",
66
"plugin_version": "0.0.2",
7-
"resolved": "github:NixOS/nixpkgs/98b00b6947a9214381112bdb6f89c25498db4959#apacheHttpd",
7+
"resolved": "github:NixOS/nixpkgs/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f#apacheHttpd",
88
"source": "devbox-search",
99
"version": "2.4.58",
1010
"systems": {
1111
"aarch64-darwin": {
1212
"outputs": [
1313
{
1414
"name": "out",
15-
"path": "/nix/store/vgjxjc4sa4zx9b42d91d8r27xbha6klz-apache-httpd-2.4.58",
15+
"path": "/nix/store/qfh8f4l6cadv117hfh9xyia4miih4wpy-apache-httpd-2.4.58",
1616
"default": true
1717
},
1818
{
1919
"name": "man",
20-
"path": "/nix/store/a12rmwciw8iqvbngxmxdwn6mnw6iylsw-apache-httpd-2.4.58-man",
20+
"path": "/nix/store/dxx8z8nvjbgh2chqq3qlrc52n0w9nlwf-apache-httpd-2.4.58-man",
2121
"default": true
2222
},
2323
{
24-
"name": "doc",
25-
"path": "/nix/store/n6c869qj61j5xyi6myr9fpz1b4i6sfrw-apache-httpd-2.4.58-doc"
24+
"name": "dev",
25+
"path": "/nix/store/pvr18halwxvrv4a3d7ymyjadqjnk3d1d-apache-httpd-2.4.58-dev"
2626
},
2727
{
28-
"name": "dev",
29-
"path": "/nix/store/ndi0n9ibvz5nydnglc4k5s3hj0p7r0xj-apache-httpd-2.4.58-dev"
28+
"name": "doc",
29+
"path": "/nix/store/3xsvcdh7w1x59pymkpzmihbvsm65gpm7-apache-httpd-2.4.58-doc"
3030
}
3131
],
32-
"store_path": "/nix/store/vgjxjc4sa4zx9b42d91d8r27xbha6klz-apache-httpd-2.4.58"
32+
"store_path": "/nix/store/qfh8f4l6cadv117hfh9xyia4miih4wpy-apache-httpd-2.4.58"
3333
},
3434
"aarch64-linux": {
3535
"outputs": [
3636
{
3737
"name": "out",
38-
"path": "/nix/store/1cvsir9an00px9kgxnydmid6629zs2dp-apache-httpd-2.4.58",
38+
"path": "/nix/store/wy3lzv5h5k3smcgpac6bwls31dhl99ki-apache-httpd-2.4.58",
3939
"default": true
4040
},
4141
{
4242
"name": "man",
43-
"path": "/nix/store/cifz6zrap0hsvc55p1qhs0mydl3ggc04-apache-httpd-2.4.58-man",
43+
"path": "/nix/store/znwzwmsrsjcdrr6psyn8innsd9nwzj7m-apache-httpd-2.4.58-man",
4444
"default": true
4545
},
4646
{
4747
"name": "dev",
48-
"path": "/nix/store/knp8xd49ms2i7a96jbinh7b1f2ljsi33-apache-httpd-2.4.58-dev"
48+
"path": "/nix/store/0h5gpxw5sxwpgz946vlb22pkax7a7sf6-apache-httpd-2.4.58-dev"
4949
},
5050
{
5151
"name": "doc",
52-
"path": "/nix/store/mal95nqarl7h3pzhfsglww85j7y1xjrj-apache-httpd-2.4.58-doc"
52+
"path": "/nix/store/5vf79ccpqxqnrw27ncyffzh3rcw12f8z-apache-httpd-2.4.58-doc"
5353
}
5454
],
55-
"store_path": "/nix/store/1cvsir9an00px9kgxnydmid6629zs2dp-apache-httpd-2.4.58"
55+
"store_path": "/nix/store/wy3lzv5h5k3smcgpac6bwls31dhl99ki-apache-httpd-2.4.58"
5656
},
5757
"x86_64-darwin": {
5858
"outputs": [
5959
{
6060
"name": "out",
61-
"path": "/nix/store/kcx3v0kyafvrc80868s3pg1gdwxh8ld5-apache-httpd-2.4.58",
61+
"path": "/nix/store/nldsf6h7y4m4vfm26ank7kjvs05g88gc-apache-httpd-2.4.58",
6262
"default": true
6363
},
6464
{
6565
"name": "man",
66-
"path": "/nix/store/c30k9g6qaxsw5zmvjrj1ll45d3ln4bqm-apache-httpd-2.4.58-man",
66+
"path": "/nix/store/i59k98mj24c35yyimpnimy13b9as05dd-apache-httpd-2.4.58-man",
6767
"default": true
6868
},
6969
{
7070
"name": "dev",
71-
"path": "/nix/store/87j16x1ywvclpdaidw038szfd1p0040c-apache-httpd-2.4.58-dev"
71+
"path": "/nix/store/4z8i6wwrf3yisklr368l0rcrpr6h3319-apache-httpd-2.4.58-dev"
7272
},
7373
{
7474
"name": "doc",
75-
"path": "/nix/store/3h7jbvd5r96ybyhdg5zj9adfbn7mmbwd-apache-httpd-2.4.58-doc"
75+
"path": "/nix/store/p9y79pah2crpqq42y24q7ns744bjpphm-apache-httpd-2.4.58-doc"
7676
}
7777
],
78-
"store_path": "/nix/store/kcx3v0kyafvrc80868s3pg1gdwxh8ld5-apache-httpd-2.4.58"
78+
"store_path": "/nix/store/nldsf6h7y4m4vfm26ank7kjvs05g88gc-apache-httpd-2.4.58"
7979
},
8080
"x86_64-linux": {
8181
"outputs": [
8282
{
8383
"name": "out",
84-
"path": "/nix/store/w2c092pbslx3f764slyl7ggi513524zb-apache-httpd-2.4.58",
84+
"path": "/nix/store/85a038nhh046pf85za9ygwrgnxyxm9xl-apache-httpd-2.4.58",
8585
"default": true
8686
},
8787
{
8888
"name": "man",
89-
"path": "/nix/store/h4snrpka9jy8zasd4qh1qgy7m65gv0pc-apache-httpd-2.4.58-man",
89+
"path": "/nix/store/ns7lx2bqkb6wy1ikv2sa64db8xialrk9-apache-httpd-2.4.58-man",
9090
"default": true
9191
},
9292
{
9393
"name": "dev",
94-
"path": "/nix/store/8kj6ks3y802pvz44lpzzw649hjdibd3c-apache-httpd-2.4.58-dev"
94+
"path": "/nix/store/rmpym29gg5wdy3pxbkimjjlcgpdfsq25-apache-httpd-2.4.58-dev"
9595
},
9696
{
9797
"name": "doc",
98-
"path": "/nix/store/14px4n84brh7gh1xmj1g4wfls94znwm9-apache-httpd-2.4.58-doc"
98+
"path": "/nix/store/c6yfg14y2hmya6qd2y31fdk7iyg2fh48-apache-httpd-2.4.58-doc"
9999
}
100100
],
101-
"store_path": "/nix/store/w2c092pbslx3f764slyl7ggi513524zb-apache-httpd-2.4.58"
101+
"store_path": "/nix/store/85a038nhh046pf85za9ygwrgnxyxm9xl-apache-httpd-2.4.58"
102102
}
103103
}
104104
}

0 commit comments

Comments
 (0)