Commit d3f687aa authored by lavado's avatar lavado
Browse files

Merge branch 'squid' into 'master' 

Remove service Actions and add Delete URL

See merge request !19
parents e997a989 e984af0d

magma/hackfest_squid_cnf/charms/squid/actions.yaml

+8 −7
Original line number Diff line number Diff line 
addurl:

    description: "Add squid config"

    description: "Add allowed URL to squid config"

    params:

        url:

            description: "URL that will be allowed"

            type: string

            default: ""

start:

    description: "Start squid service"

restart:

    description: "Retart squid service"

stop:

    description: "Stop squid service"
 
deleteurl:

    description: "Delete allowed URL squid config"

    params:

        url:

            description: "URL that will stop to be allowed"

            type: string

            default: ""

magma/hackfest_squid_cnf/charms/squid/actions/restart

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
#!/bin/bash

service squid restart

magma/hackfest_squid_cnf/charms/squid/actions/start

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
#!/bin/bash

service squid start

magma/hackfest_squid_cnf/charms/squid/actions/stop

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
#!/bin/bash

service squid stop

magma/hackfest_squid_cnf/charms/squid/config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ options: 
    image:

        type: string

        description: 'Docker image for squid'

        default: 'sameersbn/squid:latest'

        default: 'domfleischmann/squid-python'

    port:

        type: int

        description: 'Port'