Skip to content

Commit

Permalink
acme, changed underlying implementation to Neilpang/acme.sh / updated…
Browse files Browse the repository at this point in the history
… license / added service restart action
  • Loading branch information
PiBa-NL committed Dec 23, 2016
1 parent bfff56e commit 8c77fb1
Show file tree
Hide file tree
Showing 18 changed files with 5,211 additions and 1,075 deletions.
8 changes: 6 additions & 2 deletions security/pfSense-pkg-acme/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ do-install:
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/acme.inc \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/acme/acme.sh \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/acme_sh.inc \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/acme/acme_command.sh \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/acme_gui.inc \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/acme_htmllist.inc \
Expand All @@ -42,8 +48,6 @@ do-install:
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/acme_utils.inc \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/lescript.inc \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/acme/pkg_acme_tabs.inc \
${STAGEDIR}${PREFIX}/pkg/acme
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/acme/acme_accountkeys.php \
Expand Down
43 changes: 18 additions & 25 deletions security/pfSense-pkg-acme/files/etc/inc/priv/acme.priv.inc
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
<?php
/*
acme.priv.inc
part of pfSense (http://www.pfSense.org/)
Copyright (C) 2015 ESF, LLC
All rights reserved.
* acme.priv.inc
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
global $priv_list;

$priv_list['page-service-acme'] = array();
Expand Down
55 changes: 20 additions & 35 deletions security/pfSense-pkg-acme/files/usr/local/pkg/acme.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,27 @@
<packagegui>
<copyright>
<![CDATA[
/* $Id$ */
/* ====================================================================================== */
/*
acme.xml
part of pfSense (https://www.pfSense.org/)
Copyright (C) 2009 Scott Ullrich
Copyright (C) 2015 ESF, LLC
Copyright (C) 2016 PiBa-NL
All rights reserved.
*/
/* ====================================================================================== */
/*
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
/* ====================================================================================== */
* acme.xml
*
* part of pfSense (https://www.pfSense.org/)
* Copyright (C) 2015 ESF, LLC
* Copyright (C) 2016 PiBa-NL
*
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
]]>
</copyright>
<name>acme</name>
Expand Down
Loading

0 comments on commit 8c77fb1

Please sign in to comment.