Skip to content

Commit

Permalink
fix: license name and rewrite rules form location
Browse files Browse the repository at this point in the history
  • Loading branch information
@bohdan-shulha
bohdan-shulha committed Sep 9, 2024
1 parent f227d11 commit 1e75e6c
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 121 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-please.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ jobs:
type=raw,priority=1001,value=${{ needs.release-please.outputs.tag_name }}
type=raw,value=latest
labels: |
org.opencontainers.image.licenses=FSL1.1, Apache 2.0 Future License
org.opencontainers.image.licenses=FSL-1.1-Apache-2.0
annotations: |
org.opencontainers.image.licenses=FSL1.1, Apache 2.0 Future License
org.opencontainers.image.licenses=FSL-1.1-Apache-2.0
- name: Login to Docker Registry
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.title="Ptah.sh"
LABEL org.opencontainers.image.description="Self-hosted, open-source, and extensible PaaS"
LABEL org.opencontainers.image.url="https://ptah.sh"
LABEL org.opencontainers.image.source="https://github.com/ptah-sh/ptah-server"
LABEL org.opencontainers.image.licenses="FSL1.1, Apache 2.0 Future License"
LABEL org.opencontainers.image.licenses="FSL-1.1-Apache-2.0"
LABEL org.opencontainers.image.vendor="Bohdan Shulha"

RUN apt-get update \
Expand Down
241 changes: 123 additions & 118 deletions resources/js/Pages/Services/Partials/DeploymentData.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2003,154 +2003,159 @@ const extractFieldErrors = (basePath) => {
</FormField>
</ComponentBlock>

<ComponentBlock
v-model="
model.processes[state.selectedProcessIndex['caddy']]
.rewriteRules
"
v-slot="{ item }"
label="Rewrite Rules"
@remove="
model.processes[
state.selectedProcessIndex['caddy']
].rewriteRules.splice($event, 1)
"
>
<template v-if="hasFastCgiHandlers">
<hr class="col-span-full" />

<FormField
class="col-span-3"
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.rewriteRules.${item.$index}.pathFrom`
`processes.${state.selectedProcessIndex['caddy']}.fastCgi.root`
]
"
class="col-span-3"
>
<template #label>Path From</template>
<template #label>FastCGI Root</template>

<TextInput
v-model="item.pathFrom"
v-model="
model.processes[
state.selectedProcessIndex['caddy']
].fastCgi.root
"
class="w-full"
placeholder="/old-path/(.*)"
placeholder="/app/public"
/>
</FormField>

<FormField
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.rewriteRules.${item.$index}.pathTo`
]
"
class="col-span-3"
<div class="col-span-3"></div>

<template
v-for="(fastcgiVar, index) in model.processes[
state.selectedProcessIndex['caddy']
].fastCgi.env"
:key="fastcgiVar.id"
>
<template #label>Path To</template>
<div class="col-span-full grid grid-cols-6 gap-2">
<FormField
class="col-span-2"
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.fastCgi.env.${index}.name`
]
"
>
<template #label v-if="index === 0"
>FastCGI Variable Name</template
>

<TextInput
v-model="item.pathTo"
class="w-full"
placeholder="/new-path/$1"
/>
</FormField>
</ComponentBlock>
</div>
<TextInput
v-model="fastcgiVar.name"
class="w-full"
placeholder="SCRIPT_FILENAME"
/>
</FormField>

<FormField
class="col-span-4"
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.fastCgi.env.${index}.value`
]
"
>
<template #label v-if="index === 0"
>Value</template
>

<template v-if="hasFastCgiHandlers">
<hr class="col-span-full" />
<div class="flex gap-2">
<TextInput
v-model="fastcgiVar.value"
class="grow"
placeholder="/app/public/index.php"
/>

<SecondaryButton
@click="
model.processes[
state.selectedProcessIndex[
'caddy'
]
].fastCgi.env.splice(index, 1)
"
tabindex="-1"
>
<svg
class="w-4 h-4 text-gray-800 dark:text-white"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M5 12h14"
/>
</svg>
</SecondaryButton>
</div>
</FormField>
</div>
</template>
</template>
</div>

<ComponentBlock
v-model="
model.processes[state.selectedProcessIndex['caddy']]
.rewriteRules
"
v-slot="{ item }"
label="Rewrite Rules"
@remove="
model.processes[
state.selectedProcessIndex['caddy']
].rewriteRules.splice($event, 1)
"
>
<FormField
class="col-span-3"
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.fastCgi.root`
`processes.${state.selectedProcessIndex['caddy']}.rewriteRules.${item.$index}.pathFrom`
]
"
class="col-span-3"
>
<template #label>FastCGI Root</template>
<template #label>Path From</template>

<TextInput
v-model="
model.processes[state.selectedProcessIndex['caddy']]
.fastCgi.root
"
v-model="item.pathFrom"
class="w-full"
placeholder="/app/public"
placeholder="/old-path/(.*)"
/>
</FormField>

<div class="col-span-3"></div>

<template
v-for="(fastcgiVar, index) in model.processes[
state.selectedProcessIndex['caddy']
].fastCgi.env"
:key="fastcgiVar.id"
<FormField
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.rewriteRules.${item.$index}.pathTo`
]
"
class="col-span-3"
>
<div class="col-span-full grid grid-cols-6 gap-2">
<FormField
class="col-span-2"
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.fastCgi.env.${index}.name`
]
"
>
<template #label v-if="index === 0"
>FastCGI Variable Name</template
>

<TextInput
v-model="fastcgiVar.name"
class="w-full"
placeholder="SCRIPT_FILENAME"
/>
</FormField>

<FormField
class="col-span-4"
:error="
props.errors[
`processes.${state.selectedProcessIndex['caddy']}.fastCgi.env.${index}.value`
]
"
>
<template #label v-if="index === 0">Value</template>
<template #label>Path To</template>

<div class="flex gap-2">
<TextInput
v-model="fastcgiVar.value"
class="grow"
placeholder="/app/public/index.php"
/>

<SecondaryButton
@click="
model.processes[
state.selectedProcessIndex['caddy']
].fastCgi.env.splice(index, 1)
"
tabindex="-1"
>
<svg
class="w-4 h-4 text-gray-800 dark:text-white"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M5 12h14"
/>
</svg>
</SecondaryButton>
</div>
</FormField>
</div>
</template>
</template>
<TextInput
v-model="item.pathTo"
class="w-full"
placeholder="/new-path/$1"
/>
</FormField>
</ComponentBlock>
</template>

<template #actions>
Expand Down

0 comments on commit 1e75e6c

Please sign in to comment.