Skip to content

Commit ad01a95

Browse files
jaredhendrickson13jaredhendrickson13
committed
Nested unbound API calls into services directory, updated pkg-plist and Makefile to reflect changes accordingly
1 parent 16ea2dd commit ad01a95

6 files changed

Lines changed: 28 additions & 27 deletions

File tree

‎pfSense-pkg-API/Makefile‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -184,26 +184,27 @@ do-install:
184184
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/firewall/rules/delete/index.php \
185185
${STAGEDIR}${PREFIX}/www/api/v1/firewall/rules/delete
186186

187-
# UNBOUND API ENDPOINTS----------------------------------------
187+
# SERVICE API ENDPOINTS----------------------------------------
188+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services
188189
# Unbound base
189-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound
190-
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/unbound/index.php \
191-
${STAGEDIR}${PREFIX}/www/api/v1/unbound
190+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound
191+
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/services/unbound/index.php \
192+
${STAGEDIR}${PREFIX}/www/api/v1/services/unbound
192193
# Unbound add
193-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound/add
194-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound/add/hosts
195-
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/unbound/add/hosts/index.php \
196-
${STAGEDIR}${PREFIX}/www/api/v1/unbound/add/hosts
194+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/add
195+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/add/hosts
196+
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/services/unbound/add/hosts/index.php \
197+
${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/add/hosts
197198
# Unbound delete
198-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound/delete
199-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound/delete/hosts
200-
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/unbound/delete/hosts/index.php \
201-
${STAGEDIR}${PREFIX}/www/api/v1/unbound/delete/hosts
199+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/delete
200+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/delete/hosts
201+
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/services/unbound/delete/hosts/index.php \
202+
${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/delete/hosts
202203
# Unbound modify
203-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound/modify
204-
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/unbound/modify/hosts
205-
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/unbound/modify/hosts/index.php \
206-
${STAGEDIR}${PREFIX}/www/api/v1/unbound/modify/hosts
204+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/modify
205+
${MKDIR} ${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/modify/hosts
206+
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/api/v1/services/unbound/modify/hosts/index.php \
207+
${STAGEDIR}${PREFIX}/www/api/v1/services/unbound/modify/hosts
207208

208209
# INSTALL OUR PKG INFO
209210
${MKDIR} ${STAGEDIR}${DATADIR}

pfSense-pkg-API/files/usr/local/www/api/v1/unbound/add/hosts/index.php renamed to pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/add/hosts/index.php

File renamed without changes.

pfSense-pkg-API/files/usr/local/www/api/v1/unbound/delete/hosts/index.php renamed to pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/delete/hosts/index.php

File renamed without changes.

pfSense-pkg-API/files/usr/local/www/api/v1/unbound/index.php renamed to pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/index.php

File renamed without changes.

pfSense-pkg-API/files/usr/local/www/api/v1/unbound/modify/hosts/index.php renamed to pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/modify/hosts/index.php

File renamed without changes.

‎pfSense-pkg-API/pkg-plist‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@
8787
/usr/local/www/api/v1/firewall/rules/add/index.php
8888
/usr/local/www/api/v1/firewall/rules/delete/index.php
8989

90-
@dir /usr/local/www/api/v1/unbound
91-
@dir /usr/local/www/api/v1/unbound/add
92-
@dir /usr/local/www/api/v1/unbound/delete
93-
@dir /usr/local/www/api/v1/unbound/modify
94-
@dir /usr/local/www/api/v1/unbound/add/hosts
95-
@dir /usr/local/www/api/v1/unbound/delete/hosts
96-
@dir /usr/local/www/api/v1/unbound/modify/hosts
97-
/usr/local/www/api/v1/unbound/index.php
98-
/usr/local/www/api/v1/unbound/add/hosts/index.php
99-
/usr/local/www/api/v1/unbound/delete/hosts/index.php
100-
/usr/local/www/api/v1/unbound/modify/hosts/index.php
90+
@dir /usr/local/www/api/v1/services/unbound
91+
@dir /usr/local/www/api/v1/services/unbound/add
92+
@dir /usr/local/www/api/v1/services/unbound/delete
93+
@dir /usr/local/www/api/v1/services/unbound/modify
94+
@dir /usr/local/www/api/v1/services/unbound/add/hosts
95+
@dir /usr/local/www/api/v1/services/unbound/delete/hosts
96+
@dir /usr/local/www/api/v1/services/unbound/modify/hosts
97+
/usr/local/www/api/v1/services/unbound/index.php
98+
/usr/local/www/api/v1/services/unbound/add/hosts/index.php
99+
/usr/local/www/api/v1/services/unbound/delete/hosts/index.php
100+
/usr/local/www/api/v1/services/unbound/modify/hosts/index.php
101101

102102

103103
%%DATADIR%%/info.xml

0 commit comments

Comments
 (0)