net/shadowsocks: merge loose changes from master

This commit is contained in:
Franco Fichtner 2018-02-01 09:50:34 +01:00
parent d96f07f5c9
commit 2f347bc55d
4 changed files with 27 additions and 6 deletions

View file

@ -1,9 +1,9 @@
<form>
<field>
<id>general.enabled</id>
<label>Enable ShadowSocks Proxy</label>
<label>Enable ShadowSocks Server</label>
<type>checkbox</type>
<help>This will activate the ShadowSocks Proxy service.</help>
<help>This will activate the ShadowSocks Server. This lets people around the world connect via ss-local to your server.</help>
</field>
<field>
<id>general.serveraddress</id>
@ -29,4 +29,10 @@
<type>text</type>
<help>Password to authenticate against the server.</help>
</field>
<field>
<id>general.cipher</id>
<label>Cipher</label>
<type>dropdown</type>
<help>Choose the cipher to use for encryption.</help>
</field>
</form>

View file

@ -7,10 +7,9 @@
<default>0</default>
<Required>Y</Required>
</enabled>
<serveraddress type="TextField">
<serveraddress type="HostnameField">
<default>127.0.0.1</default>
<Required>Y</Required>
<mask>/\S*/</mask>
<ValidationMessage>Please provide a valid hostname or IP address.</ValidationMessage>
</serveraddress>
<serverport type="IntegerField">
@ -31,5 +30,21 @@
<default>password</default>
<Required>N</Required>
</password>
<cipher type="OptionField">
<default>AES-256-CFB</default>
<Required>Y</Required>
<OptionValues>
<aes-256-cfb>AES-256-CFB</aes-256-cfb>
<aes-256-gcm>AES-256-GCM</aes-256-gcm>
<aes-256-ctr>AES-256-CTR</aes-256-ctr>
<aes-192-cfb>AES-192-CFB</aes-192-cfb>
<aes-192-gcm>AES-192-GCM</aes-192-gcm>
<aes-192-ctr>AES-192-CTR</aes-192-ctr>
<aes-128-cfb>AES-128-CFB</aes-128-cfb>
<aes-128-gcm>AES-128-GCM</aes-128-gcm>
<aes-128-ctr>AES-128-CTR</aes-128-ctr>
<chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
</OptionValues>
</cipher>
</items>
</model>

View file

@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
</div>
</div>
<script type="text/javascript">
<script>
$( document ).ready(function() {
var data_get_map = {'frm_general_settings':"/api/shadowsocks/general/get"};
mapDataToFormUI(data_get_map).done(function(data){

View file

@ -5,6 +5,6 @@
"local_port":{{ OPNsense.shadowsocks.general.localport }},
"password":"{{ OPNsense.shadowsocks.general.password }}",
"timeout":60,
"method":"chacha20-ietf-poly1305"
"method":"{{ OPNsense.shadowsocks.general.cipher }}"
}
{% endif %}